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

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_IS_FIRST_LANE instruction.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 065ef0c5e4adcc34dbaffa3e71445b823290b7e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/065ef0c5e4adcc34dbaffa3e71445… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:56:26 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_IS_FIRST_LANE instruction. --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++++++++ tests/hlsl/wave-ops-uint.shader_test | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fd2babc3..015dbe90 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1768,6 +1768,13 @@ static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot_bit_count(struct vk result_type, vkd3d_spirv_get_op_scope_subgroup(builder), group_op, val_id); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_elect(struct vkd3d_spirv_builder *builder) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniform); + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpGroupNonUniformElect, + vkd3d_spirv_get_op_type_bool(builder), vkd3d_spirv_get_op_scope_subgroup(builder)); +} + 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) { @@ -9904,6 +9911,17 @@ static void spirv_compiler_emit_wave_bit_count(struct spirv_compiler *compiler, spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_wave_is_first_lane(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; + uint32_t val_id; + + val_id = vkd3d_spirv_build_op_group_nonuniform_elect(builder); + 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) { @@ -10272,6 +10290,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ALL_BIT_COUNT: spirv_compiler_emit_wave_bit_count(compiler, instruction); break; + case VKD3DSIH_WAVE_IS_FIRST_LANE: + spirv_compiler_emit_wave_is_first_lane(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 2c817366..9bae40ca 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -24,7 +24,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (1) probe uav 1 (1) rui (0) probe uav 1 (2) rui (0) @@ -46,7 +46,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 (0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WavePrefixBitCount.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 2810edf45bb38b803e473fbd7aa82b9f6e99736c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2810edf45bb38b803e473fbd7aa82… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 22:01:37 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WavePrefixBitCount. --- 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 2114b270..996ad845 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -344,6 +344,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_OP_MUL ] = "wave_op_mul", [VKD3DSIH_WAVE_OP_UMAX ] = "wave_op_umax", [VKD3DSIH_WAVE_OP_UMIN ] = "wave_op_umin", + [VKD3DSIH_WAVE_PREFIX_BIT_COUNT ] = "wave_prefix_bit_count", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index dd88bce8..811a7c97 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -459,6 +459,7 @@ enum dx_intrinsic_opcode DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_WAVE_ALL_BIT_COUNT = 135, + DX_WAVE_PREFIX_BIT_COUNT = 136, DX_RAW_BUFFER_LOAD = 139, DX_RAW_BUFFER_STORE = 140, }; @@ -4582,6 +4583,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_WAVE_ALL_TRUE; case DX_WAVE_ANY_TRUE: return VKD3DSIH_WAVE_ANY_TRUE; + case DX_WAVE_PREFIX_BIT_COUNT: + return VKD3DSIH_WAVE_PREFIX_BIT_COUNT; default: vkd3d_unreachable(); } @@ -6262,6 +6265,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [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}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1d4cbde8..073c4100 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -545,6 +545,7 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_OP_MUL, VKD3DSIH_WAVE_OP_UMAX, VKD3DSIH_WAVE_OP_UMIN, + VKD3DSIH_WAVE_PREFIX_BIT_COUNT, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_PREFIX_BIT_COUNT instruction.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 77259da1ad3fa654916f04172a290564861507d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/77259da1ad3fa654916f04172a290… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 22:03:14 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_PREFIX_BIT_COUNT instruction. --- libs/vkd3d-shader/spirv.c | 4 +++- tests/hlsl/wave-ops-uint.shader_test | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 015dbe90..a78af601 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9902,7 +9902,8 @@ static void spirv_compiler_emit_wave_bit_count(struct spirv_compiler *compiler, SpvGroupOperation group_op; uint32_t type_id, val_id; - group_op = SpvGroupOperationReduce; + group_op = (instruction->handler_idx == VKD3DSIH_WAVE_PREFIX_BIT_COUNT) ? SpvGroupOperationExclusiveScan + : SpvGroupOperationReduce; val_id = spirv_compiler_emit_group_nonuniform_ballot(compiler, instruction->src); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); @@ -10288,6 +10289,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, spirv_compiler_emit_wave_alu_op(compiler, instruction); break; case VKD3DSIH_WAVE_ALL_BIT_COUNT: + case VKD3DSIH_WAVE_PREFIX_BIT_COUNT: spirv_compiler_emit_wave_bit_count(compiler, instruction); break; case VKD3DSIH_WAVE_IS_FIRST_LANE: diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 9bae40ca..fd7d7695 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -196,7 +196,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 (1)

1 0

Elizabeth Figura : wined3d: Remove the GL FFP fragment pipeline.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 0180c68d6a1672cef2564f244eaad29e60512a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/0180c68d6a1672cef2564f244eaad2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:01:48 2024 -0500 wined3d: Remove the GL FFP fragment pipeline. --- dlls/wined3d/ffp_gl.c | 290 ----------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 291 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the NV_register_combiners fragment pipeline.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 2ac928cd99a844e0028e1c7c05f2a15a8851b1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ac928cd99a844e0028e1c7c05f2a1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:05:20 2024 -0500 wined3d: Remove the NV_register_combiners fragment pipeline. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/ffp_gl.c | 1226 ---------------------------------- dlls/wined3d/nvidia_texture_shader.c | 907 ------------------------- dlls/wined3d/wined3d_gl.h | 3 - dlls/wined3d/wined3d_private.h | 6 - 5 files changed, 2143 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the ATI_fragment_shader fragment pipeline.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 69e67d1ac61d9fe0345ab20e40109636d5d7c20d URL: https://gitlab.winehq.org/wine/wine/-/commit/69e67d1ac61d9fe0345ab20e401096… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:09:44 2024 -0500 wined3d: Remove the ATI_fragment_shader fragment pipeline. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/ati_fragment_shader.c | 1387 ------------------------------------ dlls/wined3d/ffp_gl.c | 330 --------- dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 7 - 5 files changed, 1726 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the ARB_fragment_program blitter.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 9c8e5928ce8295f16397d91f523789f6299d5541 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c8e5928ce8295f16397d91f523789… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:12:28 2024 -0500 wined3d: Remove the ARB_fragment_program blitter. --- dlls/wined3d/arb_program_shader.c | 1085 ------------------------------------- dlls/wined3d/device.c | 3 +- dlls/wined3d/wined3d_gl.h | 1 - 3 files changed, 1 insertion(+), 1088 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the ARB fragment pipeline.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: e3445d8af3afb7f6570c19164fdc0f09423d9176 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3445d8af3afb7f6570c19164fdc0f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:16:36 2024 -0500 wined3d: Remove the ARB fragment pipeline. --- dlls/wined3d/arb_program_shader.c | 1085 +------------------------------------ dlls/wined3d/ffp_gl.c | 39 -- dlls/wined3d/wined3d_private.h | 7 - 3 files changed, 1 insertion(+), 1130 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the ARB shader backend.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 0db23b1bf76315e13fdcb3547547f9781f22b61b URL: https://gitlab.winehq.org/wine/wine/-/commit/0db23b1bf76315e13fdcb3547547f9… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 19:28:42 2024 -0500 wined3d: Remove the ARB shader backend. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/arb_program_shader.c | 5715 ------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5717 deletions(-)

1 0

Eric Pouech : cmd: Remove malloc attribute from xrealloc.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 508b3ac99678e09812f935d4b7db6e24f88c8e7c URL: https://gitlab.winehq.org/wine/wine/-/commit/508b3ac99678e09812f935d4b7db6e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat May 11 08:47:10 2024 +0200 cmd: Remove malloc attribute from xrealloc. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 72e5ef1ad36..0e8532929cf 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -124,8 +124,9 @@ void WCMD_free_commands(CMD_LIST *cmds); void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, CMD_LIST **cmdList, BOOL retrycall); -void *xrealloc(void *, size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free) __WINE_MALLOC; +void *xrealloc(void *, size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free); +static inline void *xalloc(size_t sz) __WINE_MALLOC; static inline void *xalloc(size_t sz) { return xrealloc(NULL, sz);

1 0