wine-commits May 2024

wine-commits@winehq.org

1 participants
705 discussions

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

13 May '24

Module: vkd3d Branch: master Commit: c30976e5c22a9824700153816b57af2d9de2a044 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c30976e5c22a9824700153816b57a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:53:53 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveIsFirstLane. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 21 +++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 23 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index fbd26623..2114b270 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -335,6 +335,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_ALL_BIT_COUNT ] = "wave_all_bit_count", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", + [VKD3DSIH_WAVE_IS_FIRST_LANE ] = "wave_is_first_lane", [VKD3DSIH_WAVE_OP_ADD ] = "wave_op_add", [VKD3DSIH_WAVE_OP_IMAX ] = "wave_op_imax", [VKD3DSIH_WAVE_OP_IMIN ] = "wave_op_imin", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f1530109..dd88bce8 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -446,6 +446,7 @@ enum dx_intrinsic_opcode DX_STORE_PATCH_CONSTANT = 106, DX_OUTPUT_CONTROL_POINT_ID = 107, DX_PRIMITIVE_ID = 108, + DX_WAVE_IS_FIRST_LANE = 110, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, DX_WAVE_ANY_TRUE = 113, @@ -4490,6 +4491,25 @@ static bool sm6_parser_emit_coordinate_construct(struct sm6_parser *sm6, const s return sm6_parser_emit_reg_composite_construct(sm6, operand_regs, component_count, state, reg); } +static enum vkd3d_shader_opcode sm6_dx_map_void_op(enum dx_intrinsic_opcode op) +{ + switch (op) + { + case DX_WAVE_IS_FIRST_LANE: + return VKD3DSIH_WAVE_IS_FIRST_LANE; + default: + vkd3d_unreachable(); + } +} + +static void sm6_parser_emit_dx_void(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + vsir_instruction_init(ins, &sm6->p.location, sm6_dx_map_void_op(op)); + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) { switch (op) @@ -6241,6 +6261,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [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}, + [DX_WAVE_IS_FIRST_LANE ] = {"1", "", sm6_parser_emit_dx_void}, [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 8e3aae52..1d4cbde8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -536,6 +536,7 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_ALL_BIT_COUNT, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, + VKD3DSIH_WAVE_IS_FIRST_LANE, VKD3DSIH_WAVE_OP_ADD, VKD3DSIH_WAVE_OP_IMAX, VKD3DSIH_WAVE_OP_IMIN,

1 0

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

13 May '24

Module: vkd3d Branch: master Commit: feef2577eff1c9f06166f9f4ece549f53f7581a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/feef2577eff1c9f06166f9f4ece54… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:52:12 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_ALL_BIT_COUNT instruction. --- libs/vkd3d-shader/spirv.c | 44 ++++++++++++++++++++++++++++++++---- tests/hlsl/wave-ops-uint.shader_test | 2 +- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7ac9f3cd..fd2babc3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1760,6 +1760,14 @@ static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(struct vkd3d_spirv_ result_type, vkd3d_spirv_get_op_scope_subgroup(builder), val_id); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot_bit_count(struct vkd3d_spirv_builder *builder, + uint32_t result_type, SpvGroupOperation group_op, uint32_t val_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformBallot); + return vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, SpvOpGroupNonUniformBallotBitCount, + result_type, vkd3d_spirv_get_op_scope_subgroup(builder), group_op, 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) { @@ -9801,18 +9809,26 @@ static void spirv_compiler_emit_wave_bool_op(struct spirv_compiler *compiler, spirv_compiler_emit_store_dst(compiler, dst, val_id); } -static void spirv_compiler_emit_wave_active_ballot(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static uint32_t spirv_compiler_emit_group_nonuniform_ballot(struct spirv_compiler *compiler, + const struct vkd3d_shader_src_param *src) { 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(builder, VKD3D_SHADER_COMPONENT_UINT, VKD3D_VEC4_SIZE); val_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); val_id = vkd3d_spirv_build_op_group_nonuniform_ballot(builder, type_id, val_id); + return val_id; +} + +static void spirv_compiler_emit_wave_active_ballot(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst = instruction->dst; + uint32_t val_id; + + val_id = spirv_compiler_emit_group_nonuniform_ballot(compiler, instruction->src); spirv_compiler_emit_store_dst(compiler, dst, val_id); } @@ -9871,6 +9887,23 @@ static void spirv_compiler_emit_wave_alu_op(struct spirv_compiler *compiler, spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_wave_bit_count(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; + SpvGroupOperation group_op; + uint32_t type_id, val_id; + + group_op = 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); + val_id = vkd3d_spirv_build_op_group_nonuniform_ballot_bit_count(builder, type_id, group_op, 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) { @@ -10236,6 +10269,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_OP_UMIN: spirv_compiler_emit_wave_alu_op(compiler, instruction); break; + case VKD3DSIH_WAVE_ALL_BIT_COUNT: + spirv_compiler_emit_wave_bit_count(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 c16adab4..2c817366 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -177,7 +177,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (2) probe uav 1 (1) rui (2) probe uav 1 (2) rui (2)

1 0

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

13 May '24

Module: vkd3d Branch: master Commit: cb5163f9a428f05e80ab9bcf75a0b7320dae51be URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb5163f9a428f05e80ab9bcf75a0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:40:12 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveAllBitCount. --- 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 f2ad39f2..fbd26623 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -332,6 +332,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_ACTIVE_BIT_AND ] = "wave_active_bit_and", [VKD3DSIH_WAVE_ACTIVE_BIT_OR ] = "wave_active_bit_or", [VKD3DSIH_WAVE_ACTIVE_BIT_XOR ] = "wave_active_bit_xor", + [VKD3DSIH_WAVE_ALL_BIT_COUNT ] = "wave_all_bit_count", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_WAVE_OP_ADD ] = "wave_op_add", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 29f73636..f1530109 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -457,6 +457,7 @@ enum dx_intrinsic_opcode DX_WAVE_PREFIX_OP = 121, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, + DX_WAVE_ALL_BIT_COUNT = 135, DX_RAW_BUFFER_LOAD = 139, DX_RAW_BUFFER_STORE = 140, }; @@ -4555,6 +4556,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_BIT_COUNT: + return VKD3DSIH_WAVE_ALL_BIT_COUNT; case DX_WAVE_ALL_TRUE: return VKD3DSIH_WAVE_ALL_TRUE; case DX_WAVE_ANY_TRUE: @@ -6233,6 +6236,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_WAVE_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, [DX_WAVE_ACTIVE_BIT ] = {"m", "Rc", sm6_parser_emit_dx_wave_active_bit}, [DX_WAVE_ACTIVE_OP ] = {"n", "Rcc", sm6_parser_emit_dx_wave_op}, + [DX_WAVE_ALL_BIT_COUNT ] = {"i", "1", 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}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3951ca70..8e3aae52 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -533,6 +533,7 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_ACTIVE_BIT_AND, VKD3DSIH_WAVE_ACTIVE_BIT_OR, VKD3DSIH_WAVE_ACTIVE_BIT_XOR, + VKD3DSIH_WAVE_ALL_BIT_COUNT, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_WAVE_OP_ADD,

1 0

Eric Pouech : cmd: Move operator from CMD_COMMAND to CMD_NODE.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: e6e1bbb4109699ab6f11f58e82ade600c89adb79 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6e1bbb4109699ab6f11f58e82ade6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Apr 15 10:18:45 2024 +0200 cmd: Move operator from CMD_COMMAND to CMD_NODE. For now, the tree is degenerated into a list (as it was before). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 33 ++++++++---- programs/cmd/wcmd.h | 37 ++++++++----- programs/cmd/wcmdmain.c | 136 +++++++++++++++++++++++++++++++----------------- 3 files changed, 136 insertions(+), 70 deletions(-)

1 0

Eric Pouech : cmd: Add helpers to handle list in degenerated binary tree.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 603e81a37a937be6da578eeea85886f801fc20ba URL: https://gitlab.winehq.org/wine/wine/-/commit/603e81a37a937be6da578eeea85886… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 16 10:57:16 2024 +0200 cmd: Add helpers to handle list in degenerated binary tree. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 72 ++++++++++++++++++++++++------------------------- programs/cmd/wcmd.h | 18 ++++++++++++- programs/cmd/wcmdmain.c | 52 +++++++++++++++++------------------ 3 files changed, 79 insertions(+), 63 deletions(-)

1 0

Eric Pouech : cmd: Introduce CMD_NODE structure.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 7e70824ed5c967be706983e329bdb73b57a6373f URL: https://gitlab.winehq.org/wine/wine/-/commit/7e70824ed5c967be706983e329bdb7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 11 15:08:30 2024 +0200 cmd: Introduce CMD_NODE structure. This will allow to separate better the individual command to be executed (CMD_COMMAND) from the chaining and I/O handling of several commands (CMD_NODE). This also renames CMD_LIST into CMD_COMMAND to fit in above scheme. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 72 ++++++++++----------- programs/cmd/wcmd.h | 30 +++++---- programs/cmd/wcmdmain.c | 163 ++++++++++++++++++++++++++---------------------- 4 files changed, 144 insertions(+), 123 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

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

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_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

← Newer
1
...
45
46
47
48
49
50
51
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2024