- Wine-Commits - list.winehq.org

Henri Verbeet : configure: Build with -flto=auto when available.
by Alexandre Julliard April 30, 2024

April 30, 2024

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 April 30, 2024

April 30, 2024

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

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Coverage.
by Alexandre Julliard April 30, 2024

April 30, 2024

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

Conor McCarthy : tests/hlsl: Add SV_Coverage tests.
by Alexandre Julliard April 30, 2024

April 30, 2024

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: Handle SV_PrimitiveId.
by Alexandre Julliard April 30, 2024

April 30, 2024

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 : vkd3d-shader/dxil: Handle constexpr pointer cast.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: fb730b11cfb73a0fd972ed917d074e80d86dd565 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb730b11cfb73a0fd972ed917d074… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 15 12:08:46 2024 +1000 vkd3d-shader/dxil: Handle constexpr pointer cast. --- libs/vkd3d-shader/dxil.c | 78 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++ tests/hlsl/pointer-cast.shader_test | 4 +- 3 files changed, 83 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 556902c2..6453eba3 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -103,6 +103,7 @@ enum bitcode_constant_code CST_CODE_INTEGER = 4, CST_CODE_FLOAT = 6, CST_CODE_STRING = 8, + CST_CODE_CE_CAST = 11, CST_CODE_CE_GEP = 12, CST_CODE_CE_INBOUNDS_GEP = 20, CST_CODE_DATA = 22, @@ -2217,6 +2218,11 @@ static bool sm6_value_is_ssa(const struct sm6_value *value) return sm6_value_is_register(value) && register_is_ssa(&value->u.reg); } +static bool sm6_value_is_numeric_array(const struct sm6_value *value) +{ + return sm6_value_is_register(value) && register_is_numeric_array(&value->u.reg); +} + static inline unsigned int sm6_value_get_constant_uint(const struct sm6_value *value) { if (!sm6_value_is_constant(value)) @@ -3099,15 +3105,16 @@ static enum vkd3d_result sm6_parser_init_constexpr_gep(struct sm6_parser *sm6, c static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const struct dxil_block *block) { enum vkd3d_shader_register_type reg_type = VKD3DSPR_INVALID; - const struct sm6_type *type, *elem_type; + const struct sm6_type *type, *elem_type, *ptr_type; + size_t i, base_value_idx, value_idx; enum vkd3d_data_type reg_data_type; const struct dxil_record *record; + const struct sm6_value *src; enum vkd3d_result ret; struct sm6_value *dst; - size_t i, value_idx; uint64_t value; - for (i = 0, type = NULL; i < block->record_count; ++i) + for (i = 0, type = NULL, base_value_idx = sm6->value_count; i < block->record_count; ++i) { sm6->p.location.column = i; record = block->records[i]; @@ -3223,6 +3230,48 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const return ret; break; + case CST_CODE_CE_CAST: + if (!dxil_record_validate_operand_count(record, 3, 3, sm6)) + return VKD3D_ERROR_INVALID_SHADER; + + if ((value = record->operands[0]) != CAST_BITCAST) + { + WARN("Unhandled constexpr cast op %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast op %"PRIu64" is unhandled.", value); + return VKD3D_ERROR_INVALID_SHADER; + } + + ptr_type = sm6_parser_get_type(sm6, record->operands[1]); + if (!sm6_type_is_pointer(ptr_type)) + { + WARN("Constexpr cast at constant idx %zu is not a pointer.\n", value_idx); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast source operand is not a pointer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if ((value = record->operands[2]) >= sm6->cur_max_value) + { + WARN("Invalid value index %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid value index %"PRIu64".", value); + return VKD3D_ERROR_INVALID_SHADER; + } + else if (value == value_idx) + { + WARN("Invalid value self-reference at %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid value self-reference for a constexpr cast."); + return VKD3D_ERROR_INVALID_SHADER; + } + + /* Resolve later in case forward refs exist. */ + dst->type = type; + dst->u.reg.type = VKD3DSPR_COUNT; + dst->u.reg.idx[0].offset = value; + break; + case CST_CODE_UNDEF: dxil_record_validate_operand_max_count(record, 0, sm6); dst->u.reg.type = VKD3DSPR_UNDEF; @@ -3248,6 +3297,29 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const ++sm6->value_count; } + /* Resolve cast forward refs. */ + for (i = base_value_idx; i < sm6->value_count; ++i) + { + dst = &sm6->values[i]; + if (dst->u.reg.type != VKD3DSPR_COUNT) + continue; + + type = dst->type; + + src = &sm6->values[dst->u.reg.idx[0].offset]; + if (!sm6_value_is_numeric_array(src)) + { + WARN("Value is not an array.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast source value is not a global array element."); + return VKD3D_ERROR_INVALID_SHADER; + } + + *dst = *src; + dst->type = type; + dst->u.reg.data_type = vkd3d_data_type_from_sm6_type(type->u.pointer.type); + } + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4bb99efe..165126b5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1241,6 +1241,12 @@ static inline bool register_is_scalar_constant_zero(const struct vkd3d_shader_re && (data_type_is_64_bit(reg->data_type) ? !reg->u.immconst_u64[0] : !reg->u.immconst_u32[0]); } +static inline bool register_is_numeric_array(const struct vkd3d_shader_register *reg) +{ + return (reg->type == VKD3DSPR_IMMCONSTBUFFER || reg->type == VKD3DSPR_IDXTEMP + || reg->type == VKD3DSPR_GROUPSHAREDMEM); +} + static inline bool vsir_register_is_label(const struct vkd3d_shader_register *reg) { return reg->type == VKD3DSPR_LABEL; diff --git a/tests/hlsl/pointer-cast.shader_test b/tests/hlsl/pointer-cast.shader_test index 7cbcfc8f..6821abab 100644 --- a/tests/hlsl/pointer-cast.shader_test +++ b/tests/hlsl/pointer-cast.shader_test @@ -16,8 +16,8 @@ float4 main(float4 pos : SV_Position) : SV_Target [test] uniform 0 uint4 0 1 0x3e000000 0 -todo draw quad +draw quad probe all rgba (0.25, 0.125, 0.0, 1.0) uniform 0 uint4 1 0 0x3e000000 0 -todo draw quad +draw quad probe all rgba (0.5, 0.75, 0.0, 1.0)

1 0

Conor McCarthy : tests/hlsl: Add an SV_InstanceId test.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: 0bd6083785c9db320facb9ed519d23aacf9f9b95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0bd6083785c9db320facb9ed519d2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 12:55:44 2024 +1000 tests/hlsl: Add an SV_InstanceId test. --- Makefile.am | 1 + tests/hlsl/instance-id.shader_test | 49 ++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 9 ++++--- tests/shader_runner.h | 3 ++- tests/shader_runner_d3d11.c | 4 ++-- tests/shader_runner_d3d12.c | 4 ++-- tests/shader_runner_d3d9.c | 5 +++- tests/shader_runner_gl.c | 4 ++-- tests/shader_runner_vulkan.c | 4 ++-- 9 files changed, 70 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5820a8b1..da6200bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/hlsl/initializer-static-array.shader_test \ tests/hlsl/initializer-struct.shader_test \ tests/hlsl/intrinsic-override.shader_test \ + tests/hlsl/instance-id.shader_test \ tests/hlsl/invalid.shader_test \ tests/hlsl/inverse-trig.shader_test \ tests/hlsl/is-front-face.shader_test \ diff --git a/tests/hlsl/instance-id.shader_test b/tests/hlsl/instance-id.shader_test new file mode 100644 index 00000000..b0465670 --- /dev/null +++ b/tests/hlsl/instance-id.shader_test @@ -0,0 +1,49 @@ +[require] +shader model >= 4.0 + +[vertex shader] +struct vs_in +{ + uint instance_id : SV_InstanceId; + uint vertex_id : SV_VertexId; +}; + +struct vs_out +{ + float4 position : SV_Position; + float4 color : Color; +}; + +void main(vs_in i, out vs_out o) +{ + float2 vertices[] = + { + {0.0, 0.0}, { 0.0, 2.0}, {-2.0, 0.0}, + {0.0, 0.0}, { 2.0, 0.0}, { 0.0, 2.0}, + {0.0, 0.0}, { 0.0, -2.0}, { 2.0, 0.0}, + {0.0, 0.0}, {-2.0, 0.0}, { 0.0, -2.0}, + }; + uint pos = i.vertex_id % 3; + o.position = float4(vertices[pos + i.instance_id * 3], 0.0, 1.0); + float color = 0.25 + i.instance_id * 0.25; + o.color = float4(0.0, color, 0.0, color); +} + +[pixel shader] +struct vs_out +{ + float4 position : SV_Position; + float4 color : Color; +}; + +float4 main(vs_out i) : SV_Target +{ + return i.color; +} + +[test] +todo(sm>=6 | glsl) draw triangle list 3 4 +probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) +probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) +probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75) +probe rtv 0 (160, 360) rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8e6fdf9b..b4b440de 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -930,13 +930,13 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3, 1); } else if (match_string(line, "draw", &line)) { + unsigned int vertex_count, instance_count; D3D_PRIMITIVE_TOPOLOGY topology; struct resource_params params; - unsigned int vertex_count; if (!runner->hs_source != !runner->ds_source) fatal_error("Have a domain or hull shader but not both.\n"); @@ -975,8 +975,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) vertex_count = strtoul(line, &rest, 10); if (line == rest) fatal_error("Malformed vertex count '%s'.\n", line); + instance_count = strtoul(line = rest, &rest, 10); + if (line == rest) + instance_count = 1; - runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count); + runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count, instance_count); } else if (match_string(line, "probe", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 5f061fa7..9d41d759 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -196,7 +196,8 @@ struct shader_runner_ops struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); void (*clear)(struct shader_runner *runner, struct resource *resource, const struct vec4 *clear_value); - bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); + bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, + unsigned int instance_count); bool (*dispatch)(struct shader_runner *runner, unsigned int x, unsigned int y, unsigned int z); struct resource_readback *(*get_resource_readback)(struct shader_runner *runner, struct resource *resource); void (*release_readback)(struct shader_runner *runner, struct resource_readback *rb); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index bb1d00d6..9eb8ac4e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -634,7 +634,7 @@ static void d3d11_runner_clear(struct shader_runner *r, struct resource *res, co } static bool d3d11_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { ID3D11UnorderedAccessView *uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; ID3D11RenderTargetView *rtvs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; @@ -812,7 +812,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_DSSetShader(context, ds, NULL, 0); ID3D11DeviceContext_RSSetState(context, runner->rasterizer_state); - ID3D11DeviceContext_Draw(context, vertex_count, 0); + ID3D11DeviceContext_DrawInstanced(context, vertex_count, instance_count, 0, 0); ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8119a66e..37780682 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -494,7 +494,7 @@ static void d3d12_runner_clear(struct shader_runner *r, struct resource *resourc } static bool d3d12_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -676,7 +676,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &test_context->viewport); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, primitive_topology); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, instance_count, 0, 0); /* Finish the command list so that we can destroy objects. */ hr = ID3D12GraphicsCommandList_Close(command_list); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index f61a2305..d427576d 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -330,7 +330,7 @@ static void d3d9_runner_clear(struct shader_runner *r, struct resource *resource } static bool d3d9_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { static const D3DVERTEXELEMENT9 decl_element_end = D3DDECL_END(); struct d3d9_shader_runner *runner = d3d9_shader_runner(r); @@ -343,6 +343,9 @@ static bool d3d9_runner_draw(struct shader_runner *r, unsigned int i, j; HRESULT hr; + if (instance_count > 1) + fatal_error("Unhandled instance count %u.\n", instance_count); + if (!(vs_code = compile_shader(runner, runner->r.vs_source, "vs"))) return false; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 632ba5cc..2649dc55 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -974,7 +974,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const } static bool gl_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY topology, unsigned int vertex_count, unsigned int instance_count) { struct vkd3d_shader_signature vs_input_signature; unsigned int attribute_idx, rt_count, i, j; @@ -1159,7 +1159,7 @@ static bool gl_runner_draw(struct shader_runner *r, glDisableVertexAttribArray(attribute_idx); } - glDrawArrays(get_topology_gl(topology), 0, vertex_count); + glDrawArraysInstanced(get_topology_gl(topology), 0, vertex_count, instance_count); for (i = 0; i < runner->r.sampler_count; ++i) { diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 68a71c01..8c48c107 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1293,7 +1293,7 @@ static void vulkan_runner_clear(struct shader_runner *r, struct resource *res, c } static bool vulkan_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); @@ -1330,7 +1330,7 @@ static bool vulkan_runner_draw(struct shader_runner *r, bind_resources(runner, VK_PIPELINE_BIND_POINT_GRAPHICS, set_layout, pipeline_layout); - VK_CALL(vkCmdDraw(cmd_buffer, vertex_count, 1, 0, 0)); + VK_CALL(vkCmdDraw(cmd_buffer, vertex_count, instance_count, 0, 0)); VK_CALL(vkCmdEndRenderPass(cmd_buffer)); end_command_buffer(runner);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle SV_InstanceId.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: eef0f7c29ea150fe04e3e392af689df5f9555889 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eef0f7c29ea150fe04e3e392af689… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 13:01:41 2024 +1000 vkd3d-shader/dxil: Handle SV_InstanceId. --- libs/vkd3d-shader/dxil.c | 1 + tests/hlsl/instance-id.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 6453eba3..ca73d5e9 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -8173,6 +8173,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = { [SEMANTIC_KIND_ARBITRARY] = VKD3D_SHADER_SV_NONE, [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_ISFRONTFACE] = VKD3D_SHADER_SV_IS_FRONT_FACE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, diff --git a/tests/hlsl/instance-id.shader_test b/tests/hlsl/instance-id.shader_test index b0465670..fd0e7e8b 100644 --- a/tests/hlsl/instance-id.shader_test +++ b/tests/hlsl/instance-id.shader_test @@ -42,7 +42,7 @@ float4 main(vs_out i) : SV_Target } [test] -todo(sm>=6 | glsl) draw triangle list 3 4 +todo(glsl) draw triangle list 3 4 probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75)

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error if a CMPXCHG instruction uses a forward-referenced pointer.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: 05510c118ab07c323307b9bde886c8c65f586b73 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05510c118ab07c323307b9bde886c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 00:13:10 2024 +1000 vkd3d-shader/dxil: Emit an error if a CMPXCHG instruction uses a forward-referenced pointer. --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 5bb05058..556902c2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6462,7 +6462,8 @@ static void sm6_parser_emit_cmpxchg(struct sm6_parser *sm6, const struct dxil_re uint64_t code; if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i)) - || !sm6_value_validate_is_pointer_to_i32(ptr, sm6)) + || !sm6_value_validate_is_pointer_to_i32(ptr, sm6) + || !sm6_value_validate_is_backward_ref(ptr, sm6)) return; if (ptr->u.reg.type != VKD3DSPR_GROUPSHAREDMEM)

1 0

Conor McCarthy : tests/hlsl: Add a test for constexpr pointer cast.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: 2fc32c3d1da8c0794d5f6309f324e3238e05f9c4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2fc32c3d1da8c0794d5f6309f324e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 20:35:07 2024 +1000 tests/hlsl: Add a test for constexpr pointer cast. --- Makefile.am | 1 + tests/hlsl/pointer-cast.shader_test | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index 50a5e8b3..5820a8b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,7 @@ vkd3d_shader_tests = \ tests/hlsl/object-field-offsets.shader_test \ tests/hlsl/object-parameters.shader_test \ tests/hlsl/object-references.shader_test \ + tests/hlsl/pointer-cast.shader_test \ tests/hlsl/pow.shader_test \ tests/hlsl/precise-modifier.shader_test \ tests/hlsl/rasteriser-ordered-views.shader_test \ diff --git a/tests/hlsl/pointer-cast.shader_test b/tests/hlsl/pointer-cast.shader_test new file mode 100644 index 00000000..7cbcfc8f --- /dev/null +++ b/tests/hlsl/pointer-cast.shader_test @@ -0,0 +1,23 @@ +[require] +shader model >= 6.0 + +[pixel shader] +uint u, v, w; + +static float foo[3] = {0.25, 0.5, 0.75}; + +float4 main(float4 pos : SV_Position) : SV_Target +{ + // Compiles to a constexpr uint pointer cast of foo for a store instruction. + if (v) + foo[1] = asfloat(w); + return float4(foo[u], foo[u + 1], 0.0, 1.0); +} + +[test] +uniform 0 uint4 0 1 0x3e000000 0 +todo draw quad +probe all rgba (0.25, 0.125, 0.0, 1.0) +uniform 0 uint4 1 0 0x3e000000 0 +todo draw quad +probe all rgba (0.5, 0.75, 0.0, 1.0)

1 0