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

Alex Henrie : pdh: Add PdhConnectMachineA stub.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 30019a5b8759c2d56ac82fe7454bda09cca77b63 URL: https://gitlab.winehq.org/wine/wine/-/commit/30019a5b8759c2d56ac82fe7454bda… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 1 21:40:18 2024 -0600 pdh: Add PdhConnectMachineA stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56599 --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 711c970029b..3d51f6257ef 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -18,7 +18,7 @@ @ stdcall PdhCollectQueryDataWithTime(ptr ptr) @ stdcall PdhCollectQueryDataEx(ptr long ptr) @ stub PdhComputeCounterStatistics -@ stub PdhConnectMachineA +@ stdcall PdhConnectMachineA(str) @ stub PdhConnectMachineW @ stub PdhCreateSQLTablesA @ stub PdhCreateSQLTablesW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 12bda6bedc0..dec86a9962b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1280,3 +1280,12 @@ PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenam FIXME("%p %s: stub\n", source, debugstr_w(filenamelist)); return PDH_NOT_IMPLEMENTED; } + +/*********************************************************************** + * PdhConnectMachineA (PDH.@) + */ +PDH_STATUS WINAPI PdhConnectMachineA(const char *name) +{ + FIXME("%s: stub\n", debugstr_a(name)); + return PDH_NOT_IMPLEMENTED; +}

1 0

Alex Henrie : shell32: Add SHAssocEnumHandlersForProtocolByApplication stub.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 0af35ccd06c30cd09d378599efe33a2bb7238b4f URL: https://gitlab.winehq.org/wine/wine/-/commit/0af35ccd06c30cd09d378599efe33a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 1 22:15:25 2024 -0600 shell32: Add SHAssocEnumHandlersForProtocolByApplication stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56581 --- dlls/shell32/assoc.c | 9 +++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 37cdc01101a..45e9781d078 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1132,3 +1132,12 @@ HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnu *enumhandlers = &enumassoc->IEnumAssocHandlers_iface; return S_OK; } + +/************************************************************************** + * SHAssocEnumHandlersForProtocolByApplication [SHELL32.@] + */ +HRESULT WINAPI SHAssocEnumHandlersForProtocolByApplication(const WCHAR *protocol, REFIID riid, void **handlers) +{ + FIXME("(%s %s %p): stub\n", debugstr_w(protocol), debugstr_guid(riid), handlers); + return E_NOTIMPL; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 8155365318d..bdf3378a235 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHAssocEnumHandlersForProtocolByApplication(wstr ptr ptr) @ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr)

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVE_ANY_TRUE instruction.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 95489899bee957a4654a0516007cdf238ab93cdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/95489899bee957a4654a0516007cd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:37:25 2024 +1000 vkd3d-shader/spirv: Handle the WAVE_ANY_TRUE instruction. --- libs/vkd3d-shader/spirv.c | 3 +++ tests/hlsl/wave-ops-float.shader_test | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 848d4e4d..0a52e1a7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9766,6 +9766,8 @@ static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode handler_idx) return SpvOpGroupNonUniformAllEqual; case VKD3DSIH_WAVE_ALL_TRUE: return SpvOpGroupNonUniformAll; + case VKD3DSIH_WAVE_ANY_TRUE: + return SpvOpGroupNonUniformAny; default: vkd3d_unreachable(); } @@ -10137,6 +10139,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: case VKD3DSIH_WAVE_ALL_TRUE: + case VKD3DSIH_WAVE_ANY_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; case VKD3DSIH_DCL: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 09e7937e..b0fdcb6c 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -58,7 +58,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbaui (1, 1, 0, 0) probe uav 1 (1) rgbaui (1, 1, 0, 0) probe uav 1 (2) rgbaui (1, 1, 0, 0)

1 0

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

May 2, 2024

Module: vkd3d Branch: master Commit: fb5eb3159d7fb274e0823f45d3c3ca3a63473fa1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb5eb3159d7fb274e0823f45d3c3c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:32:52 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveAnyTrue. --- 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 6e7a5306..b2f329cd 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -329,6 +329,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", + [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 33646e75..e636ad91 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ANY_TRUE = 113, DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, @@ -4518,6 +4519,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; case DX_WAVE_ALL_TRUE: return VKD3DSIH_WAVE_ALL_TRUE; + case DX_WAVE_ANY_TRUE: + return VKD3DSIH_WAVE_ANY_TRUE; default: vkd3d_unreachable(); } @@ -6049,6 +6052,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, + [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 74ffdd57..b0e52a33 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -529,6 +529,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, VKD3DSIH_WAVE_ALL_TRUE, + VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVE_ALL_TRUE instruction.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 77ec2a5caa745525709d4db4d9d48f09ed09bac3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/77ec2a5caa745525709d4db4d9d48… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:36:03 2024 +1000 vkd3d-shader/spirv: Handle the WAVE_ALL_TRUE instruction. --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b7b4c3ec..848d4e4d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9764,6 +9764,8 @@ static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode handler_idx) { case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: return SpvOpGroupNonUniformAllEqual; + case VKD3DSIH_WAVE_ALL_TRUE: + return SpvOpGroupNonUniformAll; default: vkd3d_unreachable(); } @@ -10134,6 +10136,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, spirv_compiler_emit_cut_stream(compiler, instruction); break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: + case VKD3DSIH_WAVE_ALL_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; case VKD3DSIH_DCL:

1 0

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

May 2, 2024

Module: vkd3d Branch: master Commit: 8e2b35153803565fc93b878b25fedc668ecbb4b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e2b35153803565fc93b878b25fed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:32:52 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveAllTrue. --- 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 51de7ecd..6e7a5306 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -328,6 +328,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOF ] = "utof", [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", + [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c1e3976f..33646e75 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -4515,6 +4516,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_F16TOF32; case DX_WAVE_ACTIVE_ALL_EQUAL: return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; + case DX_WAVE_ALL_TRUE: + return VKD3DSIH_WAVE_ALL_TRUE; default: vkd3d_unreachable(); } @@ -6045,6 +6048,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, + [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d6adb689..74ffdd57 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -528,6 +528,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOF, VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, + VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVE_ACTIVE_ALL_EQUAL instruction.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 78f2d2936d1f444e793508450cd1ef0b425a6331 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78f2d2936d1f444e793508450cd1e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:25:57 2024 +1000 vkd3d-shader/spirv: Handle the WAVE_ACTIVE_ALL_EQUAL instruction. --- libs/vkd3d-shader/spirv.c | 45 +++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1da883b3..b7b4c3ec 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -361,6 +361,7 @@ struct vkd3d_spirv_builder uint32_t type_sampler_id; uint32_t type_bool_id; uint32_t type_void_id; + uint32_t scope_subgroup_id; struct vkd3d_spirv_stream debug_stream; /* debug instructions */ struct vkd3d_spirv_stream annotation_stream; /* decoration instructions */ @@ -1741,6 +1742,16 @@ static void vkd3d_spirv_build_op_memory_barrier(struct vkd3d_spirv_builder *buil SpvOpMemoryBarrier, memory_id, memory_semantics_id); } +static uint32_t vkd3d_spirv_build_op_scope_subgroup(struct vkd3d_spirv_builder *builder) +{ + return vkd3d_spirv_get_op_constant(builder, vkd3d_spirv_get_op_type_int(builder, 32, 0), SpvScopeSubgroup); +} + +static uint32_t vkd3d_spirv_get_op_scope_subgroup(struct vkd3d_spirv_builder *builder) +{ + return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup); +} + 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) { @@ -9747,6 +9758,37 @@ static void spirv_compiler_emit_cut_stream(struct spirv_compiler *compiler, vkd3d_spirv_build_op_end_primitive(builder); } +static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode handler_idx) +{ + switch (handler_idx) + { + case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: + return SpvOpGroupNonUniformAllEqual; + default: + vkd3d_unreachable(); + } +} + +static void spirv_compiler_emit_wave_bool_op(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; + SpvOp op; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformVote); + + op = map_wave_bool_op(instruction->handler_idx); + type_id = vkd3d_spirv_get_op_type_bool(builder); + val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, + type_id, vkd3d_spirv_get_op_scope_subgroup(builder), 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) { @@ -10091,6 +10133,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CUT_STREAM: spirv_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: + spirv_compiler_emit_wave_bool_op(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 74254179..09e7937e 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -36,7 +36,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbaui (1, 0, 0, 1) probe uav 1 (1) rgbaui (1, 0, 0, 1) probe uav 1 (2) rgbaui (1, 0, 0, 1)

1 0

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

May 2, 2024

Module: vkd3d Branch: master Commit: 9aa9b112e65e1de61cfcfbad69d284824c0ca1db URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9aa9b112e65e1de61cfcfbad69d28… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:18:29 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveAllEqual. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 7 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 7a8bbfc1..51de7ecd 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -327,6 +327,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOD ] = "utod", [VKD3DSIH_UTOF ] = "utof", [VKD3DSIH_UTOU ] = "utou", + [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f68e3274..c1e3976f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -4512,6 +4513,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_F32TOF16; case DX_LEGACY_F16TOF32: return VKD3DSIH_F16TOF32; + case DX_WAVE_ACTIVE_ALL_EQUAL: + return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; default: vkd3d_unreachable(); } @@ -5937,6 +5940,7 @@ struct sm6_dx_opcode_info C -> constant or undefined int8/16/32 i -> int32 m -> int16/32/64 + n -> any numeric f -> float d -> double e -> half/float @@ -6040,6 +6044,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAD ] = {"m", "RRR", sm6_parser_emit_dx_ma}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; @@ -6073,6 +6078,8 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_i32(type); case 'm': return sm6_type_is_i16_i32_i64(type); + case 'n': + return sm6_type_is_numeric(type); case 'f': return sm6_type_is_float(type); case 'd': diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d0285fdc..d6adb689 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -527,6 +527,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOD, VKD3DSIH_UTOF, VKD3DSIH_UTOU, + VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVELANEINDEX register.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: c770efc530581de422b916e6954e5311c71354ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c770efc530581de422b916e6954e5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 10:59:08 2024 +1000 vkd3d-shader/spirv: Handle the WAVELANEINDEX register. --- libs/vkd3d-shader/spirv.c | 5 +++++ tests/hlsl/wave-ops-uint.shader_test | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e76aa894..1da883b3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3157,6 +3157,9 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s case VKD3DSPR_WAVELANECOUNT: snprintf(buffer, buffer_size, "vWaveLaneCount"); break; + case VKD3DSPR_WAVELANEINDEX: + snprintf(buffer, buffer_size, "vWaveLaneIndex"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -4543,6 +4546,7 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); break; case SpvBuiltInSubgroupSize: + case SpvBuiltInSubgroupLocalInvocationId: vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniform); break; default: @@ -4736,6 +4740,7 @@ vkd3d_register_builtins[] = {VKD3DSPR_OUTSTENCILREF, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInFragStencilRefEXT}}, {VKD3DSPR_WAVELANECOUNT, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInSubgroupSize}}, + {VKD3DSPR_WAVELANEINDEX, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInSubgroupLocalInvocationId}}, }; static void spirv_compiler_emit_register_execution_mode(struct spirv_compiler *compiler, diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index de65e47d..666cf4d3 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -63,7 +63,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (0) probe uav 1 (1) rui (1) probe uav 1 (2) rui (2)

1 0

Conor McCarthy : tests/shader-runner: Skip shader model 6.0 tests if the device does not support them.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 9315bcb6a10d9860b744280a928149d365a828dd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9315bcb6a10d9860b744280a92814… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 10:51:11 2024 +1000 tests/shader-runner: Skip shader model 6.0 tests if the device does not support them. --- tests/shader_runner_d3d12.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 593d0759..be1e10ed 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -753,6 +753,16 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) runner->caps.rov = options.ROVsSupported; } +static bool device_supports_shader_model_6_0(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_SHADER_MODEL sm = {D3D_SHADER_MODEL_6_0}; + HRESULT hr; + + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &sm, sizeof(sm)); + ok(hr == S_OK, "Failed to check feature shader model support, hr %#x.\n", hr); + return sm.HighestShaderModel >= D3D_SHADER_MODEL_6_0; +} + void run_shader_tests_d3d12(void *dxc_compiler) { static const struct test_context_desc desc = @@ -792,7 +802,11 @@ void run_shader_tests_d3d12(void *dxc_compiler) { runner.caps.minimum_shader_model = SHADER_MODEL_6_0; runner.caps.maximum_shader_model = SHADER_MODEL_6_0; - run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); + + if (device_supports_shader_model_6_0(device)) + run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); + else + trace("Device does not support shader model 6.0.\n"); } ID3D12GraphicsCommandList_Release(runner.compute_list);

1 0