May 2024 - Wine-Commits - list.winehq.org

Conor McCarthy : tests/hlsl: Add a test for SV_ClipDistance.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: 01af0f94bb211462dcfd573d7fab3e0cf2d8d686 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/01af0f94bb211462dcfd573d7fab3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 1 15:43:35 2024 +1000 tests/hlsl: Add a test for SV_ClipDistance. --- Makefile.am | 1 + tests/hlsl/clip-distance.shader_test | 98 ++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/Makefile.am b/Makefile.am index b4f863fb..f901a84d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,6 +78,7 @@ vkd3d_shader_tests = \ tests/hlsl/ceil.shader_test \ tests/hlsl/cf-cond-types.shader_test \ tests/hlsl/clamp.shader_test \ + tests/hlsl/clip-distance.shader_test \ tests/hlsl/clip.shader_test \ tests/hlsl/combined-samplers.shader_test \ tests/hlsl/comma.shader_test \ diff --git a/tests/hlsl/clip-distance.shader_test b/tests/hlsl/clip-distance.shader_test new file mode 100644 index 00000000..f4767aab --- /dev/null +++ b/tests/hlsl/clip-distance.shader_test @@ -0,0 +1,98 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32 float POSITION +1 r32 float CLIP_DISTANCE + +[vb 0] +-1.0 -1.0 +-1.0 1.0 + 1.0 -1.0 + 1.0 1.0 + +[vb 1] +1.0 +1.0 +1.0 +1.0 + +[rtv 0] +format r32g32b32a32 float +size (2d, 640, 480) + +[vertex shader todo] +struct input +{ + float4 position : POSITION; + float distance : CLIP_DISTANCE; +}; + +struct vertex +{ + float4 position : SV_POSITION; + float clip : SV_ClipDistance; +}; + +void main(input vin, out vertex vertex) +{ + vertex.position = vin.position; + vertex.clip = vin.distance; +} + +[pixel shader] +float4 main(const in float4 position : SV_Position) : SV_Target +{ + return float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +clear rtv 0 1.0 1.0 1.0 1.0 +todo draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) + +[vb 1] +0.0 +0.0 +0.0 +0.0 + +[test] +clear rtv 0 1.0 1.0 1.0 1.0 +todo draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) + +[vb 1] +-1.0 +-1.0 +-1.0 +-1.0 + +[test] +clear rtv 0 1.0 1.0 1.0 1.0 +todo draw triangle strip 4 +probe all rgba (1.0, 1.0, 1.0, 1.0) + +[vb 1] +1.0 +1.0 +-1.0 +-1.0 + +[test] +clear rtv 0 1.0 1.0 1.0 1.0 +todo draw triangle strip 4 +probe rtv 0 (160, 240) rgba (0.0, 1.0, 0.0, 1.0) +probe rtv 0 (480, 240) rgba (1.0, 1.0, 1.0, 1.0) + +[vb 1] +-1.0 +1.0 +-1.0 +1.0 + +[test] +clear rtv 0 1.0 1.0 1.0 1.0 +todo draw triangle strip 4 +probe rtv 0 (320, 120) rgba (0.0, 1.0, 0.0, 1.0) +probe rtv 0 (320, 360) rgba (1.0, 1.0, 1.0, 1.0)

1 0

Conor McCarthy : tests/hlsl: Add a test for SV_Coverage out.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: e4724b4635bcb742bb4375c96e9e8e9d2b6b5551 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4724b4635bcb742bb4375c96e9e8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 1 14:55:03 2024 +1000 tests/hlsl: Add a test for SV_Coverage out. --- tests/hlsl/coverage.shader_test | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index 3a188da5..faa933fe 100644 --- a/tests/hlsl/coverage.shader_test +++ b/tests/hlsl/coverage.shader_test @@ -1,10 +1,29 @@ [require] -shader model >= 5.0 +shader model >= 4.1 [rtv 0] format r32g32b32a32 float size (2dms, 4, 640, 480) +[pixel shader todo] +float4 main(out uint sample_mask : SV_Coverage) : SV_Target +{ + sample_mask = 0x5; + return float4(1.0, 1.0, 1.0, 1.0); +} + +[test] +todo draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) +sample mask 0x0b +clear rtv 0 0.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (0.25, 0.25, 0.25, 0.25) + + +[require] +shader model >= 5.0 + [uav 1] format r32 uint size (2d, 4, 4) @@ -24,6 +43,7 @@ float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Tar [test] sample mask 0x01 +clear rtv 0 0.0 0.0 0.0 0.0 todo(sm<6) draw quad probe all rgba (0.0, 0.25, 0.0, 0.25) probe uav 1 all rui (0x01)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle SV_Coverage out.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: 4f50af4c83ee3bf5d098a5d8bdf961cb862d8caa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f50af4c83ee3bf5d098a5d8bdf96… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 12:37:31 2024 +1000 vkd3d-shader/dxil: Handle SV_Coverage out. --- libs/vkd3d-shader/dxil.c | 3 +++ tests/hlsl/coverage.shader_test | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 48b7fff3..fab0bde7 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3821,6 +3821,8 @@ static enum vkd3d_shader_register_type register_type_from_dxil_semantic_kind( { switch (sysval_semantic) { + case VKD3D_SHADER_SV_COVERAGE: + return VKD3DSPR_COVERAGE; case VKD3D_SHADER_SV_DEPTH: return VKD3DSPR_DEPTHOUT; case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: @@ -8455,6 +8457,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = [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_COVERAGE] = VKD3D_SHADER_SV_COVERAGE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, [SEMANTIC_KIND_DEPTH] = VKD3D_SHADER_SV_DEPTH, [SEMANTIC_KIND_DEPTHLESSEQUAL] = VKD3D_SHADER_SV_DEPTH_LESS_EQUAL, diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index faa933fe..e7cf30ad 100644 --- a/tests/hlsl/coverage.shader_test +++ b/tests/hlsl/coverage.shader_test @@ -13,11 +13,11 @@ float4 main(out uint sample_mask : SV_Coverage) : SV_Target } [test] -todo draw quad +todo(sm<6) draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) sample mask 0x0b clear rtv 0 0.0 0.0 0.0 0.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (0.25, 0.25, 0.25, 0.25)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneFirst.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: 47f048326749b5c2e3b19fed79cd425181e87753 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/47f048326749b5c2e3b19fed79cd4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 23:33:56 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneFirst. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index a7609578..9abc2c4d 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -346,6 +346,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_OP_UMIN ] = "wave_op_umin", [VKD3DSIH_WAVE_PREFIX_BIT_COUNT ] = "wave_prefix_bit_count", [VKD3DSIH_WAVE_READ_LANE_AT ] = "wave_read_lane_at", + [VKD3DSIH_WAVE_READ_LANE_FIRST ] = "wave_read_lane_first", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e6f24b4e..48b7fff3 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -454,6 +454,7 @@ enum dx_intrinsic_opcode DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_WAVE_ACTIVE_BALLOT = 116, DX_WAVE_READ_LANE_AT = 117, + DX_WAVE_READ_LANE_FIRST = 118, DX_WAVE_ACTIVE_OP = 119, DX_WAVE_ACTIVE_BIT = 120, DX_WAVE_PREFIX_OP = 121, @@ -4586,6 +4587,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_WAVE_ANY_TRUE; case DX_WAVE_PREFIX_BIT_COUNT: return VKD3DSIH_WAVE_PREFIX_BIT_COUNT; + case DX_WAVE_READ_LANE_FIRST: + return VKD3DSIH_WAVE_READ_LANE_FIRST; default: vkd3d_unreachable(); } @@ -6271,6 +6274,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_WAVE_PREFIX_BIT_COUNT ] = {"i", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_PREFIX_OP ] = {"n", "Rcc", sm6_parser_emit_dx_wave_op}, [DX_WAVE_READ_LANE_AT ] = {"n", "Ri", sm6_parser_emit_dx_binary}, + [DX_WAVE_READ_LANE_FIRST ] = {"n", "R", sm6_parser_emit_dx_unary}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d2a49361..81bc95c2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -547,6 +547,7 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_OP_UMIN, VKD3DSIH_WAVE_PREFIX_BIT_COUNT, VKD3DSIH_WAVE_READ_LANE_AT, + VKD3DSIH_WAVE_READ_LANE_FIRST, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_READ_LANE_FIRST instruction.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: e1c774bfeb17958790f4986a10a767940ddd29de URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1c774bfeb17958790f4986a10a76… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 23:36:42 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_READ_LANE_FIRST instruction. --- libs/vkd3d-shader/spirv.c | 27 +++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 4 ++-- tests/hlsl/wave-ops-uint.shader_test | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6b75cfb1..78f2f208 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1791,6 +1791,14 @@ static uint32_t vkd3d_spirv_build_op_group_nonuniform_shuffle(struct vkd3d_spirv vkd3d_spirv_get_op_scope_subgroup(builder), val_id, lane_id); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_broadcast_first(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformBallot); + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, SpvOpGroupNonUniformBroadcastFirst, + result_type, vkd3d_spirv_get_op_scope_subgroup(builder), val_id); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, enum GLSLstd450 op, uint32_t result_type, uint32_t operand) { @@ -9969,6 +9977,22 @@ static void spirv_compiler_emit_wave_read_lane_at(struct spirv_compiler *compile spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_wave_read_lane_first(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id; + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, + vsir_write_mask_component_count(dst->write_mask)); + val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + val_id = vkd3d_spirv_build_op_group_nonuniform_broadcast_first(builder, type_id, val_id); + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + /* This function is called after declarations are processed. */ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) { @@ -10344,6 +10368,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_READ_LANE_AT: spirv_compiler_emit_wave_read_lane_at(compiler, instruction); break; + case VKD3DSIH_WAVE_READ_LANE_FIRST: + spirv_compiler_emit_wave_read_lane_first(compiler, instruction); + break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index efa7dbc4..b54f5ac1 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -111,7 +111,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (7.0, 2.0, 8.0, 5.0) probe uav 1 (1) rgba (7.0, 2.0, 8.0, 5.0) probe uav 1 (2) rgba (7.0, 2.0, 8.0, 5.0) @@ -451,7 +451,7 @@ float4 main(float4 pos : SV_Position) : SV_Target [test] clear rtv 0 0.25 0.5 0.75 1.0 -todo draw quad +draw quad probe rtv 0 (0, 0) rgba (0.25, 0.5, 0.75, 1.0) probe rtv 0 (1, 0) rgba (1.0, 0.0, 0.0, 1.0) probe rtv 0 (0, 1) rgba (1.0, 0.0, 0.0, 1.0) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 49dbd1c2..0be5cdf6 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -139,7 +139,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (23) probe uav 1 (1) rui (23) probe uav 1 (2) rui (23)

1 0

Conor McCarthy : tests/hlsl: Clear the RTV before the WaveReadLaneFirst() test.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: cb9b10bf4d8eebc6ccefcfd15453697b68e9ad8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb9b10bf4d8eebc6ccefcfd154536… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 9 12:30:18 2024 +1000 tests/hlsl: Clear the RTV before the WaveReadLaneFirst() test. --- tests/hlsl/wave-ops-float.shader_test | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 60774fa8..efa7dbc4 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -450,6 +450,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] +clear rtv 0 0.25 0.5 0.75 1.0 todo draw quad probe rtv 0 (0, 0) rgba (0.25, 0.5, 0.75, 1.0) probe rtv 0 (1, 0) rgba (1.0, 0.0, 0.0, 1.0)

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_READ_LANE_AT instruction.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: 936d8e4f617893d8c0a7c41142090090a53d1f5f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/936d8e4f617893d8c0a7c41142090… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 9 12:25:44 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_READ_LANE_AT instruction. --- libs/vkd3d-shader/spirv.c | 47 ++++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-uint.shader_test | 4 +-- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c1079166..6b75cfb1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1775,6 +1775,22 @@ static uint32_t vkd3d_spirv_build_op_group_nonuniform_elect(struct vkd3d_spirv_b vkd3d_spirv_get_op_type_bool(builder), vkd3d_spirv_get_op_scope_subgroup(builder)); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_broadcast(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id, uint32_t lane_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformBallot); + return vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, SpvOpGroupNonUniformBroadcast, result_type, + vkd3d_spirv_get_op_scope_subgroup(builder), val_id, lane_id); +} + +static uint32_t vkd3d_spirv_build_op_group_nonuniform_shuffle(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id, uint32_t lane_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformShuffle); + return vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, SpvOpGroupNonUniformShuffle, result_type, + vkd3d_spirv_get_op_scope_subgroup(builder), val_id, lane_id); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, enum GLSLstd450 op, uint32_t result_type, uint32_t operand) { @@ -9925,6 +9941,34 @@ static void spirv_compiler_emit_wave_is_first_lane(struct spirv_compiler *compil spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_wave_read_lane_at(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, lane_id, val_id; + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, + vsir_write_mask_component_count(dst->write_mask)); + val_id = spirv_compiler_emit_load_src(compiler, &src[0], dst->write_mask); + lane_id = spirv_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + + /* TODO: detect values loaded from a const buffer? */ + if (register_is_constant_or_undef(&src[1].reg)) + { + /* Uniform lane_id only. */ + val_id = vkd3d_spirv_build_op_group_nonuniform_broadcast(builder, type_id, val_id, lane_id); + } + else + { + /* WaveReadLaneAt supports non-uniform lane ids, so if lane_id is not constant it may not be uniform. */ + val_id = vkd3d_spirv_build_op_group_nonuniform_shuffle(builder, type_id, val_id, lane_id); + } + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + /* This function is called after declarations are processed. */ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) { @@ -10297,6 +10341,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_IS_FIRST_LANE: spirv_compiler_emit_wave_is_first_lane(compiler, instruction); break; + case VKD3DSIH_WAVE_READ_LANE_AT: + spirv_compiler_emit_wave_read_lane_at(compiler, instruction); + break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 2e0bff40..49dbd1c2 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -158,7 +158,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (18) probe uav 1 (1) rui (18) probe uav 1 (2) rui (18) @@ -178,7 +178,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (18) probe uav 1 (1) rui (18) probe uav 1 (2) rui (23)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneAt.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: e41643ab8fa8e6060c800688a58ed43b85e58b18 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e41643ab8fa8e6060c800688a58ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 9 12:24:02 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneAt. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 996ad845..a7609578 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -345,6 +345,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_OP_UMAX ] = "wave_op_umax", [VKD3DSIH_WAVE_OP_UMIN ] = "wave_op_umin", [VKD3DSIH_WAVE_PREFIX_BIT_COUNT ] = "wave_prefix_bit_count", + [VKD3DSIH_WAVE_READ_LANE_AT ] = "wave_read_lane_at", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 22fdcf9f..e6f24b4e 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -453,6 +453,7 @@ enum dx_intrinsic_opcode DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_WAVE_ACTIVE_BALLOT = 116, + DX_WAVE_READ_LANE_AT = 117, DX_WAVE_ACTIVE_OP = 119, DX_WAVE_ACTIVE_BIT = 120, DX_WAVE_PREFIX_OP = 121, @@ -4620,6 +4621,8 @@ static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, co return VKD3DSIH_UMAX; case DX_UMIN: return VKD3DSIH_UMIN; + case DX_WAVE_READ_LANE_AT: + return VKD3DSIH_WAVE_READ_LANE_AT; default: vkd3d_unreachable(); } @@ -6267,6 +6270,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_WAVE_IS_FIRST_LANE ] = {"1", "", sm6_parser_emit_dx_void}, [DX_WAVE_PREFIX_BIT_COUNT ] = {"i", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_PREFIX_OP ] = {"n", "Rcc", sm6_parser_emit_dx_wave_op}, + [DX_WAVE_READ_LANE_AT ] = {"n", "Ri", sm6_parser_emit_dx_binary}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 073c4100..d2a49361 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -546,6 +546,7 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_OP_UMAX, VKD3DSIH_WAVE_OP_UMIN, VKD3DSIH_WAVE_PREFIX_BIT_COUNT, + VKD3DSIH_WAVE_READ_LANE_AT, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : tests/hlsl: Add a test for WaveReadLaneAt() with a non-uniform index.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: 5790056c445c6e393806d93ad6924e996398f44b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5790056c445c6e393806d93ad6924… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 9 12:22:03 2024 +1000 tests/hlsl: Add a test for WaveReadLaneAt() with a non-uniform index. --- tests/hlsl/wave-ops-uint.shader_test | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index fd7d7695..2e0bff40 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -165,6 +165,26 @@ probe uav 1 (2) rui (18) probe uav 1 (3) rui (18) +[compute shader] +RWBuffer<uint> u0; +RWBuffer<uint> u1; + + [numthreads(4, 1, 1)] +void main(uint id : SV_GroupIndex) +{ + uint i = u0[id] + u0[id ^ 1]; + // Non-uniform lane index + u1[id] = WaveReadLaneAt(i, (id + 2) & 3); +} + +[test] +todo dispatch 4 1 1 +probe uav 1 (0) rui (18) +probe uav 1 (1) rui (18) +probe uav 1 (2) rui (23) +probe uav 1 (3) rui (23) + + [compute shader] RWBuffer<uint> u0; RWBuffer<uint> u1;

1 0

Paul Gofman : opengl32: Prefer formats with depth if unspecified in wglChoosePixelFormat().
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 6a31983779479b42e0c2e5320a1dfa962767c28e URL: https://gitlab.winehq.org/wine/wine/-/commit/6a31983779479b42e0c2e5320a1dfa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 13 20:15:30 2024 -0600 opengl32: Prefer formats with depth if unspecified in wglChoosePixelFormat(). --- dlls/opengl32/tests/opengl.c | 1 + dlls/opengl32/wgl.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 070229254a1..25485841d70 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -326,6 +326,7 @@ static void test_choosepixelformat(void) ok( ret_fmt.cAlphaShift == 24, "Got %u.\n", ret_fmt.cAlphaShift ); else ok( !ret_fmt.cAlphaShift, "Got %u.\n", ret_fmt.cAlphaShift ); + ok( ret_fmt.cDepthBits, "Got %u.\n", ret_fmt.cDepthBits ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 87f91aef473..9d2ce4ea215 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -284,7 +284,14 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->dwFlags & PFD_DEPTH_DONTCARE && format.cDepthBits < best.cDepthBits) + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE) + { + if (format.cDepthBits < best.cDepthBits) + goto found; + continue; + } + + if (!ppfd->cDepthBits && format.cDepthBits > best.cDepthBits) goto found; continue;

1 0