April 2024 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Handle SV_PrimitiveId.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 36c76e155787e6688ae70aace3a3635bd8a2c95a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/36c76e155787e6688ae70aace3a36… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 13:03:59 2024 +1000 vkd3d-shader/dxil: Handle SV_PrimitiveId. --- libs/vkd3d-shader/dxil.c | 1 + tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ca73d5e9..96c8aba9 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -8175,6 +8175,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = [SEMANTIC_KIND_VERTEXID] = VKD3D_SHADER_SV_VERTEX_ID, [SEMANTIC_KIND_INSTANCEID] = VKD3D_SHADER_SV_INSTANCE_ID, [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, + [SEMANTIC_KIND_PRIMITIVEID] = VKD3D_SHADER_SV_PRIMITIVE_ID, [SEMANTIC_KIND_ISFRONTFACE] = VKD3D_SHADER_SV_IS_FRONT_FACE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, [SEMANTIC_KIND_DEPTH] = VKD3D_SHADER_SV_DEPTH, diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test index 82fad000..04ede0fa 100644 --- a/tests/hlsl/rasteriser-ordered-views.shader_test +++ b/tests/hlsl/rasteriser-ordered-views.shader_test @@ -64,6 +64,6 @@ shader model >= 5.0 rov [test] -todo(sm>=6) draw triangle list 93 +draw triangle list 93 probe all rui(0x6aaaaaaa) probe uav 1 all rui(0x2aaaaaaa)

1 0

Conor McCarthy : tests/hlsl: Add SV_Coverage tests.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: c2a787181f28e3d14d363486a3aa733a78f88bcb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2a787181f28e3d14d363486a3aa7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 4 15:00:26 2024 +1000 tests/hlsl: Add SV_Coverage tests. --- Makefile.am | 1 + tests/hlsl/coverage.shader_test | 56 +++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 7 ++++++ tests/shader_runner.h | 2 ++ tests/shader_runner_d3d11.c | 2 ++ tests/shader_runner_d3d12.c | 2 +- tests/shader_runner_gl.c | 2 ++ tests/shader_runner_vulkan.c | 1 + 8 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index da6200bb..c7cc579f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,7 @@ vkd3d_shader_tests = \ tests/hlsl/compute.shader_test \ tests/hlsl/conditional.shader_test \ tests/hlsl/const.shader_test \ + tests/hlsl/coverage.shader_test \ tests/hlsl/cross.shader_test \ tests/hlsl/d3dcolor-to-ubyte4.shader_test \ tests/hlsl/ddxddy.shader_test \ diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test new file mode 100644 index 00000000..ac098761 --- /dev/null +++ b/tests/hlsl/coverage.shader_test @@ -0,0 +1,56 @@ +[require] +shader model >= 5.0 + +[rtv 0] +format r32g32b32a32 float +size (2dms, 4, 640, 480) + +[uav 1] +format r32 uint +size (2d, 4, 4) +0 0 0 0 +0 0 0 0 +0 0 0 0 +0 0 0 0 + +[pixel shader todo] +RWTexture2D<uint> u : register(u1); + +float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Target +{ + InterlockedOr(u[uint2(position.x, position.y)], coverage); + return float4(0.0, 1.0, 0.0, 1.0); +} + +[test] +sample mask 0x01 +todo draw quad +probe all rgba (0.0, 0.25, 0.0, 0.25) +probe uav 1 all rui (0x01) +sample mask 0x03 +todo draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) +probe uav 1 all rui (0x03) +sample mask 0x07 +todo draw quad +probe all rgba (0.0, 0.75, 0.0, 0.75) +probe uav 1 all rui (0x07) + +[uav 1] +format r32 uint +size (2d, 4, 4) +0 0 0 0 +0 0 0 0 +0 0 0 0 +0 0 0 0 + +[test] +clear rtv 0 0.0 0.0 0.0 0.0 +sample mask 0x09 +todo draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) +probe uav 1 all rui (0x09) +sample mask 0x0f +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe uav 1 all rui (0x0f) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index b4b440de..68a7a9c5 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1231,6 +1231,13 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Unknown uniform type '%s'.\n", line); } } + else if (match_string(line, "sample mask", &line)) + { + unsigned int sample_mask; + + read_uint(&line, &sample_mask, false); + runner->sample_mask = sample_mask; + } else { fatal_error("Unknown test directive '%s'.\n", line); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 9d41d759..0457db96 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -175,6 +175,8 @@ struct shader_runner uint32_t *uniforms; size_t uniform_count, uniform_capacity; + uint32_t sample_mask; + struct resource *resources[MAX_RESOURCES]; size_t resource_count; uint32_t failed_resources[RESOURCE_TYPE_VERTEX_BUFFER + 1][VKD3D_BITMAP_SIZE(MAX_RESOURCES)]; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 9eb8ac4e..e937040f 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -803,6 +803,8 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D10Blob_Release(vs_code); + if (r->sample_mask) + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, r->sample_mask); ID3D11DeviceContext_IASetPrimitiveTopology(context, primitive_topology); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 37780682..593d0759 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -590,7 +590,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, pso_desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID; pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE; pso_desc.SampleDesc.Count = sample_count; - pso_desc.SampleMask = ~(UINT)0; + pso_desc.SampleMask = r->sample_mask ? r->sample_mask : ~(UINT)0; pso_desc.pRootSignature = test_context->root_signature; input_element_descs = calloc(runner->r.input_element_count, sizeof(*input_element_descs)); diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 2649dc55..601307ff 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -1119,6 +1119,8 @@ static bool gl_runner_draw(struct shader_runner *r, } } + /* TODO: sample count and mask. */ + glViewport(0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT); glScissor(0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT); glDrawBuffers(rt_count, draw_buffers); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 8c48c107..3d02639f 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -845,6 +845,7 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner, rs_desc.frontFace = VK_FRONT_FACE_CLOCKWISE; rs_desc.lineWidth = 1.0f; + /* TODO: sample count and mask. */ ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; pipeline_desc.stageCount = stage_count;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Coverage.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 127bcf90e4f7c5455e2ae82924860b48f440d9b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/127bcf90e4f7c5455e2ae82924860… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 4 14:29:57 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic Coverage. --- libs/vkd3d-shader/dxil.c | 8 ++++++++ tests/hlsl/coverage.shader_test | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 96c8aba9..ccba66af 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -414,6 +414,7 @@ enum dx_intrinsic_opcode DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, DX_DERIV_FINEY = 86, + DX_COVERAGE = 91, DX_THREAD_ID = 93, DX_GROUP_ID = 94, DX_THREAD_ID_IN_GROUP = 95, @@ -4817,6 +4818,12 @@ static void sm6_parser_emit_dx_input_register_mov(struct sm6_parser *sm6, instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_coverage(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + sm6_parser_emit_dx_input_register_mov(sm6, state->ins, VKD3DSPR_COVERAGE, VKD3D_DATA_UINT); +} + static const struct sm6_descriptor_info *sm6_parser_get_descriptor(struct sm6_parser *sm6, enum vkd3d_shader_descriptor_type type, unsigned int id, const struct sm6_value *address) { @@ -5935,6 +5942,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load}, [DX_COS ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_COUNT_BITS ] = {"i", "m", sm6_parser_emit_dx_unary}, + [DX_COVERAGE ] = {"i", "", sm6_parser_emit_dx_coverage}, [DX_CREATE_HANDLE ] = {"H", "ccib", sm6_parser_emit_dx_create_handle}, [DX_DERIV_COARSEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_COARSEY ] = {"e", "R", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index ac098761..3a188da5 100644 --- a/tests/hlsl/coverage.shader_test +++ b/tests/hlsl/coverage.shader_test @@ -24,15 +24,15 @@ float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Tar [test] sample mask 0x01 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.25, 0.0, 0.25) probe uav 1 all rui (0x01) sample mask 0x03 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.5, 0.0, 0.5) probe uav 1 all rui (0x03) sample mask 0x07 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.75, 0.0, 0.75) probe uav 1 all rui (0x07) @@ -47,10 +47,10 @@ size (2d, 4, 4) [test] clear rtv 0 0.0 0.0 0.0 0.0 sample mask 0x09 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 0.5, 0.0, 0.5) probe uav 1 all rui (0x09) sample mask 0x0f -todo draw quad +todo(sm<6) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe uav 1 all rui (0x0f)

1 0

Henri Verbeet : configure: Build with -flto=auto when available.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: a52a91d75614d20f30f4b6ef4db39de233873473 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a52a91d75614d20f30f4b6ef4db39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 12:04:03 2024 +0200 configure: Build with -flto=auto when available. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 10dd7157..484d559c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe -D_WIN32_WINNT=0x0600" VKD3D_CHECK_CFLAGS([-std=c99]) + VKD3D_CHECK_CFLAGS([-flto=auto]) VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wempty-body])

1 0

Giovanni Mascellani : tests: Test wave reconvergence after selections and loops.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 5e6bcc4f9d6c4d0c8a45f392b3abcf2a9e10b5a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e6bcc4f9d6c4d0c8a45f392b3abc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Apr 30 13:54:39 2024 +0200 tests: Test wave reconvergence after selections and loops. Tangled instructions, like wave operations, are sensitive to how the invocations in a wave reconverge after having diverged. Here we test for some of those scenarios. --- Makefile.am | 1 + tests/hlsl/wave-reconvergence.shader_test | 150 ++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/Makefile.am b/Makefile.am index c7cc579f..b34316a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,6 +237,7 @@ vkd3d_shader_tests = \ tests/hlsl/vertex-shader-ops.shader_test \ tests/hlsl/wave-ops-float.shader_test \ tests/hlsl/wave-ops-uint.shader_test \ + tests/hlsl/wave-reconvergence.shader_test \ tests/hlsl/writemask-assignop-0.shader_test \ tests/hlsl/writemask-assignop-1.shader_test \ tests/hlsl/writemask-assignop-2.shader_test \ diff --git a/tests/hlsl/wave-reconvergence.shader_test b/tests/hlsl/wave-reconvergence.shader_test new file mode 100644 index 00000000..66698da8 --- /dev/null +++ b/tests/hlsl/wave-reconvergence.shader_test @@ -0,0 +1,150 @@ +[require] +shader model >= 6.0 + +[uav 0] +format r32 uint +size (buffer, 4) + +0x0 0x1 0x2 0x13 + +[uav 1] +format r32 uint +size (buffer, 4) + +0x100 0x200 0x400 0x800 + +[uav 2] +format r32 uint +size (buffer, 20) + +0 0 0 0 0 +0 0 0 0 0 +0 0 0 0 0 +0 0 0 0 0 + +[compute shader] +RWBuffer<uint> u0 : register(u0); +RWBuffer<uint> u1 : register(u1); +RWBuffer<uint> u2 : register(u2); + + [numthreads(4, 1, 1)] +void main(uint id : SV_GroupIndex) +{ + const unsigned int POS_COUNT = 5; + unsigned int i, pos = 0; + /* If SPV_KHR_subgroup_uniform_control_flow is not supported, + * SPIR-V doesn't guarantee reconvergence after the loop. */ + for (i = 0; i < 2; ++i) + { + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 1; + if (u0[id] & (1 << i)) + { + /* In many programming languages this statement could be + * moved after the loop. Not here, because the set of + * active invocations is supposed to depend on whether + * we're still in the loop (i.e., before reconverging the + * invocations that diverged during the loop) or not. */ + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 2; + break; + } + else + { + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 3; + } + } + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 4; +} + +[test] +todo dispatch 4 1 1 +probe uav 2 (0) rui (0xf01) +probe uav 2 (1) rui (0x503) +probe uav 2 (2) rui (0x511) +probe uav 2 (3) rui (0x113) +probe uav 2 (4) rui (0xf24) + +probe uav 2 (5) rui (0xf01) +probe uav 2 (6) rui (0xa02) +probe uav 2 (7) rui (0xf04) +probe uav 2 (8) rui (0) +probe uav 2 (9) rui (0) + +probe uav 2 (10) rui (0xf01) +probe uav 2 (11) rui (0x503) +probe uav 2 (12) rui (0x511) +probe uav 2 (13) rui (0x412) +probe uav 2 (14) rui (0xf14) + +probe uav 2 (15) rui (0xf01) +probe uav 2 (16) rui (0xa02) +probe uav 2 (17) rui (0xf04) +probe uav 2 (18) rui (0) +probe uav 2 (19) rui (0) + +[uav 2] +format r32 uint +size (buffer, 20) + +0 0 0 0 0 +0 0 0 0 0 +0 0 0 0 0 +0 0 0 0 0 + +[compute shader] +RWBuffer<uint> u0 : register(u0); +RWBuffer<uint> u1 : register(u1); +RWBuffer<uint> u2 : register(u2); + + [numthreads(4, 1, 1)] +void main(uint id : SV_GroupIndex) +{ + const unsigned int POS_COUNT = 5; + unsigned int i, pos = 0; + /* If SPV_KHR_maximal_reconvergence is not supported, SPIR-V + * doesn't guarantee reconvergence after the loop even if + * SPV_KHR_subgroup_uniform_control_flow is supported, because the + * flow wasn't fully convergent when entering the loop. */ + if (!(u0[id] & 0x10)) + { + for (i = 0; i < 2; ++i) + { + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 1; + if (u0[id] & (1 << i)) + { + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 2; + break; + } + else + { + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 3; + } + } + u2[POS_COUNT * id + pos++] = WaveActiveSum(u1[id]) + 16 * i + 4; + } +} + +[test] +todo dispatch 4 1 1 +probe uav 2 (0) rui (0x701) +probe uav 2 (1) rui (0x503) +probe uav 2 (2) rui (0x511) +probe uav 2 (3) rui (0x113) +probe uav 2 (4) rui (0x724) + +probe uav 2 (5) rui (0x701) +probe uav 2 (6) rui (0x202) +probe uav 2 (7) rui (0x704) +probe uav 2 (8) rui (0) +probe uav 2 (9) rui (0) + +probe uav 2 (10) rui (0x701) +probe uav 2 (11) rui (0x503) +probe uav 2 (12) rui (0x511) +probe uav 2 (13) rui (0x412) +probe uav 2 (14) rui (0x714) + +probe uav 2 (15) rui (0) +probe uav 2 (16) rui (0) +probe uav 2 (17) rui (0) +probe uav 2 (18) rui (0) +probe uav 2 (19) rui (0)

1 0

Giovanni Mascellani : tests: Add missing test file.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 766913f911578b3185d90717cf615b016d5a4dd4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/766913f911578b3185d90717cf615… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Apr 30 14:12:52 2024 +0200 tests: Add missing test file. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index b34316a1..d4b1619e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -236,6 +236,7 @@ vkd3d_shader_tests = \ tests/hlsl/vector-indexing.shader_test \ tests/hlsl/vertex-shader-ops.shader_test \ tests/hlsl/wave-ops-float.shader_test \ + tests/hlsl/wave-ops-int.shader_test \ tests/hlsl/wave-ops-uint.shader_test \ tests/hlsl/wave-reconvergence.shader_test \ tests/hlsl/writemask-assignop-0.shader_test \

1 0

Henri Verbeet : vkd3d-shader/hlsl: Use vkd3d_string_buffer_printf() in declare_predefined_types().
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 8b8ad07057ff52c269900753e0c001816dac52ad URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8b8ad07057ff52c269900753e0c00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 17:08:03 2024 +0200 vkd3d-shader/hlsl: Use vkd3d_string_buffer_printf() in declare_predefined_types(). --- libs/vkd3d-shader/hlsl.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4fc1493b..5edebb60 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3517,6 +3517,7 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry) static void declare_predefined_types(struct hlsl_ctx *ctx) { + struct vkd3d_string_buffer *name; unsigned int x, y, bt, i, v; struct hlsl_type *type; @@ -3529,7 +3530,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) "uint", "bool", }; - char name[15]; static const char *const variants_float[] = {"min10float", "min16float"}; static const char *const variants_int[] = {"min12int", "min16int"}; @@ -3573,28 +3573,34 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"technique11", 11}, }; + if (!(name = hlsl_get_string_buffer(ctx))) + return; + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { for (y = 1; y <= 4; ++y) { for (x = 1; x <= 4; ++x) { - sprintf(name, "%s%ux%u", names[bt], y, x); - type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s%ux%u", names[bt], y, x); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { - sprintf(name, "%s%u", names[bt], x); - type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s%u", names[bt], x); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_VECTOR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.vector[bt][x - 1] = type; if (x == 1) { - sprintf(name, "%s", names[bt]); - type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s", names[bt]); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_SCALAR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.scalar[bt] = type; } @@ -3637,22 +3643,25 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) { for (x = 1; x <= 4; ++x) { - sprintf(name, "%s%ux%u", variants[v], y, x); - type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s%ux%u", variants[v], y, x); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_MATRIX, bt, x, y); type->is_minimum_precision = 1; hlsl_scope_add_type(ctx->globals, type); if (y == 1) { - sprintf(name, "%s%u", variants[v], x); - type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s%u", variants[v], x); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_VECTOR, bt, x, y); type->is_minimum_precision = 1; hlsl_scope_add_type(ctx->globals, type); if (x == 1) { - sprintf(name, "%s", variants[v]); - type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); + vkd3d_string_buffer_clear(name); + vkd3d_string_buffer_printf(name, "%s", variants[v]); + type = hlsl_new_type(ctx, name->buffer, HLSL_CLASS_SCALAR, bt, x, y); type->is_minimum_precision = 1; hlsl_scope_add_type(ctx->globals, type); } @@ -3690,6 +3699,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) type->e.version = technique_types[i].version; hlsl_scope_add_type(ctx->globals, type); } + + hlsl_release_string_buffer(ctx, name); } static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info *compile_info,

1 0

Henri Verbeet : vkd3d-shader/spirv: Use location information from the current instruction.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: b761f1a2639e4d471df2bdd0b203adcf7d464427 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b761f1a2639e4d471df2bdd0b203a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 22:03:57 2024 +0200 vkd3d-shader/spirv: Use location information from the current instruction. --- libs/vkd3d-shader/spirv.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f833a473..cb1f5ded 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2453,8 +2453,7 @@ static void spirv_compiler_destroy(struct spirv_compiler *compiler) static struct spirv_compiler *spirv_compiler_create(const struct vsir_program *program, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location, - uint64_t config_flags) + struct vkd3d_shader_message_context *message_context, uint64_t config_flags) { const struct shader_signature *patch_constant_signature = &program->patch_constant_signature; const struct shader_signature *output_signature = &program->output_signature; @@ -2470,7 +2469,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vsir_program *p memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; - compiler->location = *location; + compiler->location.source_name = compile_info->source_name; compiler->config_flags = config_flags; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) @@ -9732,6 +9731,8 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, { int ret = VKD3D_OK; + compiler->location = instruction->location; + switch (instruction->handler_idx) { case VKD3DSIH_DCL_GLOBAL_FLAGS: @@ -10175,9 +10176,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, spirv_compiler_emit_descriptor_declarations(compiler); - compiler->location.column = 0; - compiler->location.line = 1; - if (program->block_count && !spirv_compiler_init_blocks(compiler, program->block_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -10202,7 +10200,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, for (i = 0; i < instructions.count && result >= 0; ++i) { - compiler->location.line = i + 1; result = spirv_compiler_handle_instruction(compiler, &instructions.elements[i]); } @@ -10296,7 +10293,7 @@ int spirv_compile(struct vkd3d_shader_parser *parser, int ret; if (!(spirv_compiler = spirv_compiler_create(&parser->program, compile_info, - scan_descriptor_info, message_context, &parser->location, parser->config_flags))) + scan_descriptor_info, message_context, parser->config_flags))) { ERR("Failed to create SPIR-V compiler.\n"); return VKD3D_ERROR;

1 0

Henri Verbeet : vkd3d-shader: Get rid of struct vkd3d_shader_desc.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 87c83e2ae296e88999cc90046913f9a7f6c1c45e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/87c83e2ae296e88999cc90046913f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 23:29:18 2024 +0200 vkd3d-shader: Get rid of struct vkd3d_shader_desc. --- libs/vkd3d-shader/d3dbc.c | 22 ++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_main.c | 21 +++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +--------- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 09e4f596..aa235844 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -215,8 +215,12 @@ struct vkd3d_shader_sm1_parser struct vkd3d_shader_parser p; + struct + { #define MAX_CONSTANT_COUNT 8192 - uint32_t constant_def_mask[3][VKD3D_BITMAP_SIZE(MAX_CONSTANT_COUNT)]; + uint32_t def_mask[VKD3D_BITMAP_SIZE(MAX_CONSTANT_COUNT)]; + uint32_t count; + } constants[3]; }; /* This table is not order or position dependent. */ @@ -750,15 +754,13 @@ static bool add_signature_element_from_semantic(struct vkd3d_shader_sm1_parser * static void record_constant_register(struct vkd3d_shader_sm1_parser *sm1, enum vkd3d_shader_d3dbc_constant_register set, uint32_t index, bool from_def) { - struct vkd3d_shader_desc *desc = &sm1->p.shader_desc; - - desc->flat_constant_count[set].used = max(desc->flat_constant_count[set].used, index + 1); + sm1->constants[set].count = max(sm1->constants[set].count, index + 1); if (from_def) { /* d3d shaders have a maximum of 8192 constants; we should not overrun * this array. */ - assert((index / 32) <= ARRAY_SIZE(sm1->constant_def_mask[set])); - bitmap_set(sm1->constant_def_mask[set], index); + assert((index / 32) <= ARRAY_SIZE(sm1->constants[set].def_mask)); + bitmap_set(sm1->constants[set].def_mask, index); } } @@ -1301,9 +1303,9 @@ static uint32_t get_external_constant_count(struct vkd3d_shader_sm1_parser *sm1, /* Find the highest constant index which is not written by a DEF * instruction. We can't (easily) use an FFZ function for this since it * needs to be limited by the highest used register index. */ - for (j = sm1->p.shader_desc.flat_constant_count[set].used; j > 0; --j) + for (j = sm1->constants[set].count; j > 0; --j) { - if (!bitmap_is_set(sm1->constant_def_mask[set], j - 1)) + if (!bitmap_is_set(sm1->constants[set].def_mask, j - 1)) return j; } @@ -1354,8 +1356,8 @@ int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compi ++instructions->count; } - for (i = 0; i < ARRAY_SIZE(sm1->p.shader_desc.flat_constant_count); ++i) - sm1->p.shader_desc.flat_constant_count[i].external = get_external_constant_count(sm1, i); + for (i = 0; i < ARRAY_SIZE(sm1->p.program.flat_constant_count); ++i) + sm1->p.program.flat_constant_count[i] = get_external_constant_count(sm1, i); if (!sm1->p.failed) ret = vkd3d_shader_parser_validate(&sm1->p); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 4342a176..0d3bf891 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1403,6 +1403,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_scan_descriptor_info1 local_descriptor_info1 = {0}; struct vkd3d_shader_scan_descriptor_info *descriptor_info; struct vkd3d_shader_scan_signature_info *signature_info; + struct vsir_program *program = &parser->program; struct vkd3d_shader_instruction *instruction; struct vkd3d_shader_scan_context context; int ret = VKD3D_OK; @@ -1428,27 +1429,27 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info descriptor_info1 = &local_descriptor_info1; } - vkd3d_shader_scan_context_init(&context, &parser->program.shader_version, compile_info, + vkd3d_shader_scan_context_init(&context, &program->shader_version, compile_info, descriptor_info1, combined_sampler_info, message_context); if (TRACE_ON()) - vkd3d_shader_trace(&parser->program); + vkd3d_shader_trace(program); - for (i = 0; i < parser->program.instructions.count; ++i) + for (i = 0; i < program->instructions.count; ++i) { - instruction = &parser->program.instructions.elements[i]; + instruction = &program->instructions.elements[i]; if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) break; } - for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) + for (i = 0; i < ARRAY_SIZE(program->flat_constant_count); ++i) { - unsigned int size = parser->shader_desc.flat_constant_count[i].external; struct vkd3d_shader_register_range range = {.space = 0, .first = i, .last = i}; struct vkd3d_shader_register reg = {.idx[0].offset = i, .idx_count = 1}; + unsigned int size = program->flat_constant_count[i]; struct vkd3d_shader_descriptor_info1 *d; - if (parser->shader_desc.flat_constant_count[i].external) + if (size) { if ((d = vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT))) @@ -1458,11 +1459,11 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info if (!ret && signature_info) { - if (!vkd3d_shader_signature_from_shader_signature(&signature_info->input, &parser->program.input_signature) + if (!vkd3d_shader_signature_from_shader_signature(&signature_info->input, &program->input_signature) || !vkd3d_shader_signature_from_shader_signature(&signature_info->output, - &parser->program.output_signature) + &program->output_signature) || !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant, - &parser->program.patch_constant_signature)) + &program->patch_constant_signature)) { ret = VKD3D_ERROR_OUT_OF_MEMORY; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1b60d96e..4bb99efe 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1061,14 +1061,6 @@ struct dxbc_shader_desc struct shader_signature patch_constant_signature; }; -struct vkd3d_shader_desc -{ - struct - { - uint32_t used, external; - } flat_constant_count[3]; -}; - struct vkd3d_shader_register_semantic { struct vkd3d_shader_dst_param reg; @@ -1332,6 +1324,7 @@ struct vsir_program struct shader_signature patch_constant_signature; unsigned int input_control_point_count, output_control_point_count; + unsigned int flat_constant_count[3]; unsigned int block_count; unsigned int temp_count; unsigned int ssa_count; @@ -1366,7 +1359,6 @@ struct vkd3d_shader_parser struct vkd3d_shader_location location; bool failed; - struct vkd3d_shader_desc shader_desc; const struct vkd3d_shader_parser_ops *ops; struct vsir_program program;

1 0

Alexandre Julliard : vkd3d-shader: Avoid non-constant initializer.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 91762a62c6a3fbc8ab4692119bf431a9324b11d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/91762a62c6a3fbc8ab4692119bf43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 09:46:04 2024 +0200 vkd3d-shader: Avoid non-constant initializer. Fixes "initializer element is not constant" error with gcc < 8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56508 --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 6a1fb6bd..1bc389ca 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -31,7 +31,7 @@ static const uint64_t GLOBALVAR_FLAG_EXPLICIT_TYPE = 2; static const unsigned int GLOBALVAR_ADDRESS_SPACE_SHIFT = 2; static const uint64_t ALLOCA_FLAG_IN_ALLOCA = 0x20; static const uint64_t ALLOCA_FLAG_EXPLICIT_TYPE = 0x40; -static const uint64_t ALLOCA_ALIGNMENT_MASK = ALLOCA_FLAG_IN_ALLOCA - 1; +static const uint64_t ALLOCA_ALIGNMENT_MASK = 0x1f; static const unsigned int SHADER_DESCRIPTOR_TYPE_COUNT = 4; static const size_t MAX_IR_INSTRUCTIONS_PER_DXIL_INSTRUCTION = 11;

1 0