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

Zebediah Figura : vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union.
by Alexandre Julliard 06 May '24

06 May '24

Module: vkd3d Branch: master Commit: 2480eec98bf75fed34af39bbbe1fd9d2520ef674 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2480eec98bf75fed34af39bbbe1fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 27 17:30:51 2024 -0600 vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union. --- libs/vkd3d-shader/d3dbc.c | 10 +- libs/vkd3d-shader/fx.c | 8 +- libs/vkd3d-shader/hlsl.c | 45 +++++---- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.y | 51 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 64 ++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 170 +++++++++++++++++----------------- libs/vkd3d-shader/tpf.c | 74 +++++++-------- 8 files changed, 218 insertions(+), 212 deletions(-)

1 0

Zebediah Figura : vkd3d-utils: Fix bounds comparison against element counts.
by Alexandre Julliard 06 May '24

06 May '24

Module: vkd3d Branch: master Commit: 68562d375e0fba682bf6bfa32397c43d210ef602 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68562d375e0fba682bf6bfa32397c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 20:56:40 2024 -0500 vkd3d-utils: Fix bounds comparison against element counts. --- libs/vkd3d-utils/reflection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index f4cc78bc..4f3a1a24 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -102,7 +102,7 @@ static ID3D12ShaderReflectionType * STDMETHODCALLTYPE d3d12_type_GetMemberTypeBy TRACE("iface %p, index %u.\n", iface, index); - if (index > type->desc.Members) + if (index >= type->desc.Members) { WARN("Invalid index %u.\n", index); return &null_type.ID3D12ShaderReflectionType_iface; @@ -301,7 +301,7 @@ static ID3D12ShaderReflectionVariable * STDMETHODCALLTYPE d3d12_buffer_GetVariab TRACE("iface %p, index %u.\n", iface, index); - if (index > buffer->desc.Variables) + if (index >= buffer->desc.Variables) { WARN("Invalid index %u.\n", index); return &null_variable.ID3D12ShaderReflectionVariable_iface; @@ -422,7 +422,7 @@ static struct ID3D12ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d12_ref TRACE("iface %p, index %u.\n", iface, index); - if (index > reflection->desc.ConstantBuffers) + if (index >= reflection->desc.ConstantBuffers) { WARN("Invalid index %u.\n", index); return &null_buffer.ID3D12ShaderReflectionConstantBuffer_iface;

1 0

Zebediah Figura : vkd3d-shader/tpf: Write the field offset in bytes.
by Alexandre Julliard 06 May '24

06 May '24

Module: vkd3d Branch: master Commit: 7b3c47ba2ec28531b1342331396c0ac28fe3e4c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b3c47ba2ec28531b1342331396c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:07:13 2024 -0500 vkd3d-shader/tpf: Write the field offset in bytes. --- libs/vkd3d-shader/tpf.c | 2 +- tests/hlsl_d3d12.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c98667de..4e3bef96 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3090,7 +3090,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b put_u32(buffer, field->name_bytecode_offset); put_u32(buffer, field->type->bytecode_offset); - put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); + put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC] * sizeof(float)); } type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID)); put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type))); diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4d03efd5..4ab08816 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1333,7 +1333,7 @@ static void check_type_desc_(int line, const D3D12_SHADER_TYPE_DESC *type, const ok_(line)(type->Columns == expect->Columns, "Got %u columns.\n", type->Columns); ok_(line)(type->Elements == expect->Elements, "Got %u elements.\n", type->Elements); ok_(line)(type->Members == expect->Members, "Got %u members.\n", type->Members); - ok_(line)(type->Offset == expect->Offset, "Got %u members.\n", type->Members); + ok_(line)(type->Offset == expect->Offset, "Got offset %u.\n", type->Offset); ok_(line)(!strcmp(type->Name, expect->Name), "Got name \"%s\".\n", type->Name); } #define check_type_desc(a, b) check_type_desc_(__LINE__, a, b) @@ -1407,7 +1407,7 @@ static void test_reflection(void) static const D3D12_SHADER_TYPE_DESC r_field_types[] = { {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, + {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 16, "float4"}, }; static const struct shader_variable globals_vars = @@ -1519,7 +1519,7 @@ static void test_reflection(void) static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] = { {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 4, "float"}, }; static const D3D12_SHADER_TYPE_DESC ps_i_field_types[] = @@ -1588,10 +1588,10 @@ static void test_reflection(void) for (unsigned int j = 0; j < buffer_desc.Variables; ++j) { const struct shader_variable *expect = &expect_buffer->vars[j]; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; ID3D12ShaderReflectionType *type, *field; ID3D12ShaderReflectionVariable *var; D3D12_SHADER_VARIABLE_DESC var_desc; - D3D12_SHADER_TYPE_DESC type_desc; vkd3d_test_push_context("Variable %u", j); @@ -1623,9 +1623,9 @@ static void test_reflection(void) vkd3d_test_push_context("Field %u", k); field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, k); - hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); + hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_type_desc(&type_desc, &expect->field_types[k]); + check_type_desc(&field_desc, &expect->field_types[k]); vkd3d_test_pop_context(); }

1 0

Zebediah Figura : vkd3d-utils: Initialize the null type vtbl.
by Alexandre Julliard 06 May '24

06 May '24

Module: vkd3d Branch: master Commit: 35d388eedd87ca3a8d53b8faded59e5ed28f86d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/35d388eedd87ca3a8d53b8faded59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:11:54 2024 -0500 vkd3d-utils: Initialize the null type vtbl. --- libs/vkd3d-utils/reflection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 4f3a1a24..0c9017a4 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -197,6 +197,8 @@ static const struct ID3D12ShaderReflectionTypeVtbl d3d12_type_vtbl = d3d12_type_ImplementsInterface, }; +static struct d3d12_type null_type = {{&d3d12_type_vtbl}}; + static struct d3d12_variable *impl_from_ID3D12ShaderReflectionVariable(ID3D12ShaderReflectionVariable *iface) { return CONTAINING_RECORD(iface, struct d3d12_variable, ID3D12ShaderReflectionVariable_iface);

1 0

Zebediah Figura : tests: Test bounds checking in ID3D12ShaderReflection.
by Alexandre Julliard 06 May '24

06 May '24

Module: vkd3d Branch: master Commit: 694d39ffe655e1507f1b7a42a388b9d180806c1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/694d39ffe655e1507f1b7a42a388b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:13:51 2024 -0500 tests: Test bounds checking in ID3D12ShaderReflection. --- tests/hlsl_d3d12.c | 62 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4ab08816..ffab9fdd 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1555,7 +1555,14 @@ static void test_reflection(void) for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) { ID3D10Blob *code = compile_shader_flags(tests[t].source, - tests[t].profile, D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + tests[t].profile, strstr(tests[t].profile, "5_1") ? 0 : D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + ID3D12ShaderReflectionConstantBuffer *cbuffer; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; + D3D12_SHADER_INPUT_BIND_DESC binding_desc; + ID3D12ShaderReflectionType *type, *field; + D3D12_SHADER_BUFFER_DESC buffer_desc; + ID3D12ShaderReflectionVariable *var; + D3D12_SHADER_VARIABLE_DESC var_desc; ID3D12ShaderReflection *reflection; D3D12_SHADER_DESC shader_desc; @@ -1571,8 +1578,6 @@ static void test_reflection(void) for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) { const struct shader_buffer *expect_buffer = &tests[t].buffers[i]; - ID3D12ShaderReflectionConstantBuffer *cbuffer; - D3D12_SHADER_BUFFER_DESC buffer_desc; vkd3d_test_push_context("Buffer %u", i); @@ -1588,10 +1593,6 @@ static void test_reflection(void) for (unsigned int j = 0; j < buffer_desc.Variables; ++j) { const struct shader_variable *expect = &expect_buffer->vars[j]; - D3D12_SHADER_TYPE_DESC type_desc, field_desc; - ID3D12ShaderReflectionType *type, *field; - ID3D12ShaderReflectionVariable *var; - D3D12_SHADER_VARIABLE_DESC var_desc; vkd3d_test_push_context("Variable %u", j); @@ -1630,35 +1631,56 @@ static void test_reflection(void) vkd3d_test_pop_context(); } + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, type_desc.Members); + hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + vkd3d_test_pop_context(); } + var = ID3D12ShaderReflectionConstantBuffer_GetVariableByIndex(cbuffer, buffer_desc.Variables); + hr = ID3D12ShaderReflectionVariable_GetDesc(var, &var_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + type = ID3D12ShaderReflectionVariable_GetType(var); + hr = ID3D12ShaderReflectionType_GetDesc(type, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, 0); + hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + vkd3d_test_pop_context(); } + cbuffer = ID3D12ShaderReflection_GetConstantBufferByIndex(reflection, shader_desc.ConstantBuffers); + hr = ID3D12ShaderReflectionConstantBuffer_GetDesc(cbuffer, &buffer_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + for (unsigned int i = 0; i < shader_desc.BoundResources; ++i) { const D3D12_SHADER_INPUT_BIND_DESC *expect = &tests[t].bindings[i]; - D3D12_SHADER_INPUT_BIND_DESC desc; vkd3d_test_push_context("Binding %u", i); - hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &desc); + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &binding_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!strcmp(desc.Name, expect->Name), "Got name \"%s\".\n", desc.Name); - ok(desc.Type == expect->Type, "Got type %#x.\n", desc.Type); - ok(desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", desc.BindPoint); - ok(desc.BindCount == expect->BindCount, "Got bind count %u.\n", desc.BindCount); + ok(!strcmp(binding_desc.Name, expect->Name), "Got name \"%s\".\n", binding_desc.Name); + ok(binding_desc.Type == expect->Type, "Got type %#x.\n", binding_desc.Type); + ok(binding_desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", binding_desc.BindPoint); + ok(binding_desc.BindCount == expect->BindCount, "Got bind count %u.\n", binding_desc.BindCount); todo_if ((expect->uFlags & D3D_SIF_USERPACKED) && expect->Type != D3D_SIT_CBUFFER) - ok(desc.uFlags == expect->uFlags, "Got flags %#x.\n", desc.uFlags); - ok(desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", desc.ReturnType); - ok(desc.Dimension == expect->Dimension, "Got dimension %#x.\n", desc.Dimension); - ok(desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", desc.NumSamples); + ok(binding_desc.uFlags == expect->uFlags, "Got flags %#x.\n", binding_desc.uFlags); + ok(binding_desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", binding_desc.ReturnType); + ok(binding_desc.Dimension == expect->Dimension, "Got dimension %#x.\n", binding_desc.Dimension); + ok(binding_desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", binding_desc.NumSamples); vkd3d_test_pop_context(); } + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, shader_desc.BoundResources, &binding_desc); + todo ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = ID3D12ShaderReflection_Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount); @@ -1845,6 +1867,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetInputParameterDesc(reflection, shader_desc.InputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + for (unsigned int j = 0; j < shader_desc.OutputParameters; ++j) { vkd3d_test_push_context("Output %u", j); @@ -1854,6 +1879,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, shader_desc.OutputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Fotios Valasiadis : ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h.
by Alexandre Julliard 06 May '24

06 May '24

Module: wine Branch: master Commit: 24ca848c568d5a2786abd26f2e7314b2e3f509f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314… Author: Fotios Valasiadis <fvalasiad(a)gmail.com> Date: Sun May 5 03:34:57 2024 +0300 ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h. After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer build on musl. Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. A little digging shows that glibc goes ahead and includes asm/ioctls.h in sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies on bits/ioctl.h, which lacks said macro. Signed-off-by: Fotios Valasiadis <fvalasiad(a)gmail.com> --- dlls/ntdll/unix/serial.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index d48c49c87f6..bb8d52cc627 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -33,6 +33,7 @@ #include <stdio.h> #ifdef HAVE_ASM_TERMBITS_H # include <asm/termbits.h> +# include <asm/ioctls.h> #else # include <termios.h> #endif

1 0

Biswapriyo Nath : include: Avoid a C++ keyword.
by Alexandre Julliard 06 May '24

06 May '24

Module: wine Branch: master Commit: 469a4837bc00954c6c90a632658785eaacd961f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/469a4837bc00954c6c90a632658785… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun May 5 04:53:03 2024 +0000 include: Avoid a C++ keyword. This fixes the following C++ compiler error mfmediaengine.h:1216:18: error: expected ',' or '...' before 'protected' 1216 | BOOL *protected) = 0; | ^~~~~~~~~ --- include/mfmediaengine.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 6547ef87462..27b6bbcd7d7 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -305,7 +305,7 @@ interface IMFMediaEngineEx : IMFMediaEngine HRESULT GetStreamSelection([in] DWORD stream_index, [out] BOOL *enabled); HRESULT SetStreamSelection([in] DWORD stream_index, [in] BOOL enabled); HRESULT ApplyStreamSelections(); - HRESULT IsProtected([out] BOOL *protected); + HRESULT IsProtected([out] BOOL *is_protected); HRESULT InsertVideoEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT InsertAudioEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT RemoveAllEffects();

1 0

Billy Laws : ntdll: Allocate wow64 environment block within the 32-bit address space.
by Alexandre Julliard 06 May '24

06 May '24

Module: wine Branch: master Commit: 79fb59e21ed9da33b2dccdfca3f001ef54723555 URL: https://gitlab.winehq.org/wine/wine/-/commit/79fb59e21ed9da33b2dccdfca3f001… Author: Billy Laws <blaws05(a)gmail.com> Date: Wed Apr 17 18:27:56 2024 +0000 ntdll: Allocate wow64 environment block within the 32-bit address space. --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ad9ab0dc220..b15db0ec23c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1815,7 +1815,7 @@ static void *build_wow64_parameters( const RTL_USER_PROCESS_PARAMETERS *params ) + ((params->RuntimeInfo.MaximumLength + 1) & ~1) + params->EnvironmentSize); - status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, 0, &size, + status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, limit_2g - 1, &size, MEM_COMMIT, PAGE_READWRITE ); assert( !status );

1 0

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

06 May '24

Module: vkd3d Branch: master Commit: 174a692a17427884ab23423d3b26e36b112d0e20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/174a692a17427884ab23423d3b26e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 20:57:43 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBallot. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 19 +++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index b2f329cd..0e182506 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_ACTIVE_BALLOT ] = "wave_active_ballot", [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 e636ad91..048281ee 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -432,6 +432,7 @@ enum dx_intrinsic_opcode DX_WAVE_ANY_TRUE = 113, DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, + DX_WAVE_ACTIVE_BALLOT = 116, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -5910,6 +5911,20 @@ static void sm6_parser_emit_dx_texture_store(struct sm6_parser *sm6, enum dx_int dst_param_init_with_mask(dst_param, write_mask); } +static void sm6_parser_emit_dx_wave_active_ballot(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; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_WAVE_ACTIVE_BALLOT); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); +} + static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5954,6 +5969,7 @@ struct sm6_dx_opcode_info H -> handle D -> Dimensions S -> splitdouble + V -> 4 x i32 v -> void o -> overloaded R -> matches the return type @@ -6051,6 +6067,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_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, [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}, @@ -6102,6 +6119,8 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.Dimensions"); case 'S': return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble"); + case 'V': + return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.fouri32"); case 'v': return !type; case 'o': diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 04344586..14d27c11 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_ACTIVE_BALLOT, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR,

1 0

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

06 May '24

Module: vkd3d Branch: master Commit: 1c49b3a77938b909f398df7a6ed10e91bc0979eb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c49b3a77938b909f398df7a6ed10… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:00:56 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BALLOT instruction. --- libs/vkd3d-shader/spirv.c | 26 ++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 2 +- tests/hlsl/wave-ops-uint.shader_test | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d50288c0..7dc8feea 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1752,6 +1752,14 @@ static uint32_t vkd3d_spirv_get_op_scope_subgroup(struct vkd3d_spirv_builder *bu return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(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, SpvOpGroupNonUniformBallot, + 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) { @@ -9793,6 +9801,21 @@ 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) +{ + 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); + + 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) { @@ -10142,6 +10165,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ANY_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; + case VKD3DSIH_WAVE_ACTIVE_BALLOT: + spirv_compiler_emit_wave_active_ballot(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 b0fdcb6c..2c402db1 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -81,7 +81,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbaui (0xb, 0, 0, 0) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 666cf4d3..cf2daebd 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -120,7 +120,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (5) probe uav 1 (1) rui (5) probe uav 1 (2) rui (5)

1 0