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

Francisco Casas : tests: Test SM1 constant register allocation with reservations.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: b56ae0f1c85bd9bb0ac2591f4122049fe53420c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b56ae0f1c85bd9bb0ac2591f41220… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 3 04:11:58 2024 -0400 tests: Test SM1 constant register allocation with reservations. --- tests/hlsl/sm1-const-allocation.shader_test | 119 ++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index 741545b1..3f4da40a 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -254,3 +254,122 @@ uniform 4 float4 11 12 13 14 uniform 8 float4 21 22 23 24 draw quad todo probe all rgba (21, 22, 1, 11) + + +[pixel shader] +// If there is a register reservation, the whole variable size is reserved. +float a[4] : register(c1); +float b[4]; + +float4 main() : sv_target +{ + return float4(a[0], b[1], 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// a c1 1 +// b c5 2 +// + +[test] +uniform 0 float 0 +uniform 4 float 1 +uniform 8 float 2 +uniform 12 float 3 +uniform 16 float 4 +uniform 20 float 5 +uniform 24 float 6 +draw quad +probe all rgba (1, 6, 0, 0) + + +[pixel shader] +// If there is a register reservation, the whole variable size is reserved. +float4x4 a : register(c1); +float b[4]; + +float4 main() : sv_target +{ + return float4(a[0].x, b[1], 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// a c1 1 +// b c5 2 +// + +[test] +uniform 0 float 0 +uniform 4 float 1 +uniform 8 float 2 +uniform 12 float 3 +uniform 16 float 4 +uniform 20 float 5 +uniform 24 float 6 +draw quad +probe all rgba (1, 6, 0, 0) + + +[pixel shader] +// If there is a register reservation, the whole variable size is reserved, even if unused. +float4x4 unused : register(c1); +float b[4]; + +float4 main() : sv_target +{ + return float4(0, b[1], 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// b c5 2 +// + +[test] +uniform 0 float 0 +uniform 4 float 1 +uniform 8 float 2 +uniform 12 float 3 +uniform 16 float 4 +uniform 20 float 5 +uniform 24 float 6 +draw quad +todo probe all rgba (0, 6, 0, 0) + + +[pixel shader] +float unused[2] : register(c2); // will create a gap in c0. +float size3[3]; // cannot be placed in c0. +float size2[2]; // can be placed in c0. + +float4 main() : sv_target +{ + float4 res; + + res.x = size3[2]; + res.y = size2[1]; + res.z = 0; + res.w = 0; + return res; +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// size2 c0 2 +// size3 c4 3 +[test] +uniform 0 float 0 +uniform 4 float 1 +uniform 8 float 2 +uniform 12 float 3 +uniform 16 float 4 +uniform 20 float 5 +uniform 24 float 6 +draw quad +todo probe all rgba (6, 1, 0, 0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Allocate unused variables with register reservations on SM1.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 657e460d11a08fabce2b412de0f88a4c34a201f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/657e460d11a08fabce2b412de0f88… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 3 19:32:52 2024 -0400 vkd3d-shader/hlsl: Allocate unused variables with register reservations on SM1. --- libs/vkd3d-shader/d3dbc.c | 6 +++--- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl/sm1-const-allocation.shader_test | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 24a95224..c7991407 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1713,7 +1713,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - if (var->semantic.name || !var->regs[r].allocated) + if (var->semantic.name || !var->regs[r].allocated || !var->last_read) continue; ++uniform_count; @@ -1751,7 +1751,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - if (var->semantic.name || !var->regs[r].allocated) + if (var->semantic.name || !var->regs[r].allocated || !var->last_read) continue; put_u32(buffer, 0); /* name */ @@ -1780,7 +1780,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe { size_t var_offset, name_offset; - if (var->semantic.name || !var->regs[r].allocated) + if (var->semantic.name || !var->regs[r].allocated || !var->last_read) continue; var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 8882deaf..4af55293 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4529,7 +4529,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi { unsigned int reg_size = var->data_type->reg_size[HLSL_REGSET_NUMERIC]; - if (!var->is_uniform || !var->last_read || reg_size == 0) + if (!var->is_uniform || reg_size == 0) continue; if (var->reg_reservation.reg_type == 'c') diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index ca641b14..0a4340ea 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -339,7 +339,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -todo probe all rgba (0, 6, 0, 0) +probe all rgba (0, 6, 0, 0) [pixel shader] @@ -372,7 +372,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -todo probe all rgba (6, 1, 0, 0) +probe all rgba (6, 1, 0, 0) [pixel shader todo]

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS15 in CheckFeatureSupport().
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 5445c4c8aabdb64e50906246324ede220e870e5d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5445c4c8aabdb64e50906246324ed… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:19:28 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS15 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ecda1a40..35994c20 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2454,6 +2454,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 BOOL IndependentFrontAndBackStencilRefMaskSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS14; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 +{ + BOOL TriangleFanSupported; + BOOL DynamicIndexBufferStripCutSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS15; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2490,6 +2496,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, D3D12_FEATURE_D3D12_OPTIONS14 = 43, + D3D12_FEATURE_D3D12_OPTIONS15 = 44, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 58a58050..ba745e54 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3938,6 +3938,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS15: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS15 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->TriangleFanSupported = FALSE; + data->DynamicIndexBufferStripCutSupported = FALSE; + + TRACE("Triangle fan %#x.\n", data->TriangleFanSupported); + TRACE("Dynamic index buffer strip cut %#x.\n", data->DynamicIndexBufferStripCutSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Return E_INVALIDARG if the requested shader model is unknown.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: fb20639eb449295131ca8e3c93fd5b4abc79da9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb20639eb449295131ca8e3c93fd5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 1 00:01:02 2024 +1000 vkd3d: Return E_INVALIDARG if the requested shader model is unknown. --- libs/vkd3d/device.c | 8 ++++++++ tests/d3d12.c | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3eb7ec85..6b39663a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3487,6 +3487,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return E_INVALIDARG; } + if (data->HighestShaderModel != D3D_SHADER_MODEL_5_1 + && (data->HighestShaderModel < D3D_SHADER_MODEL_6_0 + || data->HighestShaderModel > D3D_HIGHEST_SHADER_MODEL)) + { + WARN("Unknown shader model %#x.\n", data->HighestShaderModel); + return E_INVALIDARG; + } + TRACE("Request shader model %#x.\n", data->HighestShaderModel); #ifdef VKD3D_SHADER_UNSUPPORTED_DXIL diff --git a/tests/d3d12.c b/tests/d3d12.c index 8db0af99..f55eefc0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1010,15 +1010,12 @@ static void test_check_feature_support(void) "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, sm); shader_model.HighestShaderModel = 0x89; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); shader_model.HighestShaderModel = 0x52; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); shader_model.HighestShaderModel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Root signature */

1 0

Conor McCarthy : vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: d17956ced877690d6f455f259d7766f113ad8b2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d17956ced877690d6f455f259d776… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 30 23:59:27 2024 +1000 vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL. --- libs/vkd3d/device.c | 4 ++-- tests/d3d12.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 36d84339..3eb7ec85 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3490,9 +3490,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 TRACE("Request shader model %#x.\n", data->HighestShaderModel); #ifdef VKD3D_SHADER_UNSUPPORTED_DXIL - data->HighestShaderModel = D3D_SHADER_MODEL_6_0; + data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_6_0); #else - data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_5_1); #endif TRACE("Shader model %#x.\n", data->HighestShaderModel); diff --git a/tests/d3d12.c b/tests/d3d12.c index 0258604d..8db0af99 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -994,7 +994,6 @@ static void test_check_feature_support(void) shader_model.HighestShaderModel = D3D_SHADER_MODEL_5_1; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); - todo ok(shader_model.HighestShaderModel <= D3D_SHADER_MODEL_5_1, "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, D3D_SHADER_MODEL_5_1); for (sm = D3D_HIGHEST_SHADER_MODEL; sm >= D3D_SHADER_MODEL_6_0; --sm)

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS14 in CheckFeatureSupport().
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 761ee1e487a7f1c6db9e46e07d34c81198015e80 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/761ee1e487a7f1c6db9e46e07d34c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:15:59 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS14 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 8 ++++++++ libs/vkd3d/device.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9b1b494c..ecda1a40 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2447,6 +2447,13 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS13 BOOL AlphaBlendFactorSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS13; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 +{ + BOOL AdvancedTextureOpsSupported; + BOOL WriteableMSAATexturesSupported; + BOOL IndependentFrontAndBackStencilRefMaskSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS14; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2482,6 +2489,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS11 = 40, D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, + D3D12_FEATURE_D3D12_OPTIONS14 = 43, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 6b39663a..58a58050 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3919,6 +3919,25 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS14: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS14 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->AdvancedTextureOpsSupported = FALSE; + data->WriteableMSAATexturesSupported = FALSE; + data->IndependentFrontAndBackStencilRefMaskSupported = FALSE; + + TRACE("Advanced texture ops %#x.\n", data->AdvancedTextureOpsSupported); + TRACE("Writeable MSAA textures %#x.\n", data->WriteableMSAATexturesSupported); + TRACE("Independent front and back stencil ref mask %#x.\n", data->IndependentFrontAndBackStencilRefMaskSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : tests: Add tests for D3D12_FEATURE_SHADER_MODEL.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 677c23f1fe2cfd63ac5338f92eb7653b081cd6af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/677c23f1fe2cfd63ac5338f92eb76… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 8 15:28:47 2024 +1000 tests: Add tests for D3D12_FEATURE_SHADER_MODEL. --- tests/d3d12.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d75a7ffe..0258604d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -800,9 +800,11 @@ static void test_check_feature_support(void) D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; + D3D12_FEATURE_DATA_SHADER_MODEL shader_model; D3D12_FEATURE_DATA_FORMAT_INFO format_info; unsigned int expected_plane_count; ID3D12Device *device; + D3D_SHADER_MODEL sm; DXGI_FORMAT format; ULONG refcount; bool is_todo; @@ -988,6 +990,39 @@ static void test_check_feature_support(void) trace("GPU virtual address bits per process: %u.\n", gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + /* Shader model */ + shader_model.HighestShaderModel = D3D_SHADER_MODEL_5_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); + todo + ok(shader_model.HighestShaderModel <= D3D_SHADER_MODEL_5_1, + "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, D3D_SHADER_MODEL_5_1); + for (sm = D3D_HIGHEST_SHADER_MODEL; sm >= D3D_SHADER_MODEL_6_0; --sm) + { + shader_model.HighestShaderModel = sm; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + break; + } + ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); + trace("Highest shader model %#x.\n", shader_model.HighestShaderModel); + ok(shader_model.HighestShaderModel <= sm, + "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, sm); + shader_model.HighestShaderModel = 0x89; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + shader_model.HighestShaderModel = 0x52; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + shader_model.HighestShaderModel = 0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Root signature */ root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, &root_signature, sizeof(root_signature));

1 0

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

May 13, 2024

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 WaveIsFirstLane.
by Alexandre Julliard May 13, 2024

May 13, 2024

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/dxil: Implement DX intrinsic WavePrefixBitCount.
by Alexandre Julliard May 13, 2024

May 13, 2024

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