December 2023 - Wine-commits

Zebediah Figura : vkd3d-shader: Add a helper to search the scan descriptor info.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 28f32349f4fa11b3b40b961a351b07fb7677d425 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/28f32349f4fa11b3b40b961a351b0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 24 17:25:55 2023 -0600 vkd3d-shader: Add a helper to search the scan descriptor info. Avoid shadowing "info" in vkd3d_shader_scan_combined_sampler_declaration(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 43 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 77164c9c..88155502 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -890,6 +890,21 @@ static void vkd3d_shader_scan_combined_sampler_declaration( &semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT); } +static const struct vkd3d_shader_descriptor_info1 *find_descriptor( + const struct vkd3d_shader_scan_descriptor_info1 *info, + enum vkd3d_shader_descriptor_type type, unsigned int register_id) +{ + for (unsigned int i = 0; i < info->descriptor_count; ++i) + { + const struct vkd3d_shader_descriptor_info1 *d = &info->descriptors[i]; + + if (d->type == type && d->register_id == register_id) + return d; + } + + return NULL; +} + static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { @@ -915,7 +930,6 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co if (vkd3d_shader_ver_ge(context->version, 5, 1)) { - const struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; const struct vkd3d_shader_descriptor_info1 *d; bool dynamic_resource, dynamic_sampler; @@ -930,30 +944,13 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co if (dynamic_resource || dynamic_sampler) return; - for (i = 0; i < info->descriptor_count; ++i) - { - d = &info->descriptors[i]; - if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SRV) - continue; - if (d->register_id != resource->idx[0].offset) - continue; + if ((d = find_descriptor(context->scan_descriptor_info, + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource->idx[0].offset))) resource_space = d->register_space; - break; - } - if (sampler) - { - for (i = 0; i < info->descriptor_count; ++i) - { - d = &info->descriptors[i]; - if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) - continue; - if (d->register_id != sampler->idx[0].offset) - continue; - sampler_space = d->register_space; - break; - } - } + if (sampler && (d = find_descriptor(context->scan_descriptor_info, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->idx[0].offset))) + sampler_space = d->register_space; } for (i = 0; i < info->combined_sampler_count; ++i)

1 0

Zebediah Figura : configure: Enable -Wshadow.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 26a30b85399ba4618e72d949bee231511b2277b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/26a30b85399ba4618e72d949bee23… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:43:43 2023 -0500 configure: Enable -Wshadow. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 1b6003b0..84209d31 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) + VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wpointer-arith])

1 0

Stefan Dösinger : tests: Show that creating identical root signatures returns the same pointer.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 705cf106264f03cb22a906fbca00d56bb3d0ea96 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/705cf106264f03cb22a906fbca00d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 21:22:43 2023 +0300 tests: Show that creating identical root signatures returns the same pointer. --- tests/d3d12.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e3a840..5d894d4b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2633,15 +2633,19 @@ static void test_create_unordered_access_view(void) static void test_create_root_signature(void) { + ID3D12RootSignature *root_signature, *root_signature2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; D3D12_RESOURCE_BINDING_TIER binding_tier; D3D12_ROOT_PARAMETER root_parameters[3]; - ID3D12RootSignature *root_signature; ID3D12Device *device, *tmp_device; + unsigned int size; ULONG refcount; HRESULT hr; + static const GUID test_guid + = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2653,6 +2657,43 @@ static void test_create_root_signature(void) * ranges of different types. */ binding_tier = get_resource_binding_tier(device); + /* empty root signature */ + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + /* Creating the same root signature twice returns the same interface pointer. + * + * However, the root signature object actually gets destroyed after releasing + * the last reference. Re-creating the same root descriptor later does not + * reliably return the same interface pointer, although it might do so if the + * heap manager reuses the allocation. */ + hr = create_root_signature(device, &root_signature_desc, &root_signature2); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + todo ok(root_signature == root_signature2, "Got different root signature pointers.\n"); + refcount = ID3D12RootSignature_Release(root_signature2); + todo ok(refcount == 1, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + + hr = 0xdeadbeef; + hr = ID3D12RootSignature_SetPrivateData(root_signature, &test_guid, sizeof(hr), &hr); + ok(hr == S_OK, "Failed to set private data, hr %#x.\n", hr); + hr = ID3D12RootSignature_GetPrivateData(root_signature, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + hr = ID3D12RootSignature_GetPrivateData(root_signature, &test_guid, &size, NULL); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* descriptor table */ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[0].NumDescriptors = 1; @@ -2685,6 +2726,12 @@ static void test_create_root_signature(void) check_interface(root_signature, &IID_ID3D12Pageable, false); check_interface(root_signature, &IID_ID3D12RootSignature, true); + hr = create_root_signature(device, &root_signature_desc, &root_signature2); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + todo ok(root_signature == root_signature2, "Got different root signature pointers.\n"); + refcount = ID3D12RootSignature_Release(root_signature2); + todo ok(refcount == 1, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2747,17 +2794,6 @@ static void test_create_root_signature(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* empty root signature */ - root_signature_desc.NumParameters = 0; - root_signature_desc.pParameters = NULL; - root_signature_desc.NumStaticSamplers = 0; - root_signature_desc.pStaticSamplers = NULL; - root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; - hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - refcount = ID3D12RootSignature_Release(root_signature); - ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); - /* root constants */ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; root_parameters[0].Constants.ShaderRegister = 0;

1 0

Stefan Dösinger : tests: Show that graphics pipeline state objects are not reused.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 82a3209ee200b7dc7443512fdc47b754cc363ae3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/82a3209ee200b7dc7443512fdc47b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 21:35:52 2023 +0300 tests: Show that graphics pipeline state objects are not reused. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d894d4b..5f145194 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3067,10 +3067,10 @@ static void test_create_compute_pipeline_state(void) static void test_create_graphics_pipeline_state(void) { + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device *device, *tmp_device; D3D12_BLEND_DESC *blend; ULONG refcount; @@ -3105,6 +3105,13 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state2); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);

1 0

Stefan Dösinger : tests: Show that compute pipeline state objects are not reused.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 1eaf7fa37bbef1a3ab51cca962c1b1e2d93a2fc9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1eaf7fa37bbef1a3ab51cca962c1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 2 22:30:07 2023 +0300 tests: Show that compute pipeline state objects are not reused. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f145194..1fa24121 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2991,9 +2991,9 @@ static void test_root_signature_limits(void) static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device *device, *tmp_device; ID3D10Blob *bytecode; ULONG refcount; @@ -3036,6 +3036,13 @@ static void test_create_compute_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); + hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state2); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);

1 0

Stefan Dösinger : tests: Show that CreatePipelineState also doesn't reuse duplicate objects.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: b0d1fb0bd78f848a008ebc10113d4b7363a6aa02 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0d1fb0bd78f848a008ebc10113d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 4 11:04:46 2023 +0300 tests: Show that CreatePipelineState also doesn't reuse duplicate objects. --- tests/d3d12.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1fa24121..1126d974 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3227,9 +3227,9 @@ static void test_create_graphics_pipeline_state(void) static void test_create_pipeline_state(void) { + ID3D12PipelineState *pipeline_state, *pipeline_state2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature; - ID3D12PipelineState *pipeline_state; ID3D12Device2 *device2; ID3D12Device *device; unsigned int i; @@ -3685,6 +3685,13 @@ static void test_create_pipeline_state(void) if (hr == S_OK) { + hr = ID3D12Device2_CreatePipelineState(device2, &tests[i].stream_desc, &IID_ID3D12PipelineState, + (void **)&pipeline_state2); + ok(hr == S_OK, "Got unexpected return value %#x.\n", hr); + ok(pipeline_state != pipeline_state2, "Got the same pipeline state object.\n"); + refcount = ID3D12PipelineState_Release(pipeline_state2); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12PipelineState_Release(pipeline_state); ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 45679a966c73669bdb7fa371569dcc34a448d8d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/45679a966c73669bdb7fa371569dc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 8 00:34:10 2023 +1000 vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input(). --- libs/vkd3d-shader/ir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 710811c6..a35ef862 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -463,6 +463,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i struct vkd3d_shader_instruction_array *instructions; struct control_point_normaliser normaliser; unsigned int input_control_point_count; + struct vkd3d_shader_location location; struct vkd3d_shader_instruction *ins; enum vkd3d_result ret; unsigned int i, j; @@ -513,8 +514,10 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i return VKD3D_OK; case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_JOIN_PHASE: + /* ins may be relocated if the instruction array expands. */ + location = ins->location; ret = control_point_normaliser_emit_hs_input(&normaliser, input_signature, - input_control_point_count, i, &ins->location); + input_control_point_count, i, &location); *src_instructions = normaliser.instructions; return ret; default:

1 0

Conor McCarthy : vkd3d-shader/spirv: Support declared component type and count in indexable temps.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 69c3946c85221beda173bccea0aa97c2e4736cd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69c3946c85221beda173bccea0aa9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 00:07:01 2023 +1000 vkd3d-shader/spirv: Support declared component type and count in indexable temps. --- libs/vkd3d-shader/spirv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 956389dc..2eee09d8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5493,14 +5493,12 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil { const struct vkd3d_shader_indexable_temp *temp = &instruction->declaration.indexable_temp; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; size_t function_location; uint32_t id; - if (temp->component_count != 4) - FIXME("Unhandled component count %u.\n", temp->component_count); - vsir_register_init(&reg, VKD3DSPR_IDXTEMP, VKD3D_DATA_FLOAT, 1); reg.idx[0].offset = temp->register_idx; @@ -5516,16 +5514,17 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil function_location = spirv_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location); + component_type = vkd3d_component_type_from_data_type(temp->data_type); id = spirv_compiler_emit_array_variable(compiler, &builder->function_stream, - SpvStorageClassFunction, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &temp->register_size, 1); + SpvStorageClassFunction, component_type, temp->component_count, &temp->register_size, 1); spirv_compiler_emit_register_debug_name(builder, id, &reg); vkd3d_spirv_end_function_stream_insertion(builder); vkd3d_symbol_make_register(&reg_symbol, &reg); - vkd3d_symbol_set_register_info(&reg_symbol, id, - SpvStorageClassFunction, VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); + vkd3d_symbol_set_register_info(&reg_symbol, id, SpvStorageClassFunction, + component_type, vkd3d_write_mask_from_component_count(temp->component_count)); spirv_compiler_put_symbol(compiler, &reg_symbol); }

1 0

Conor McCarthy : vkd3d-shader/dxil: Support null constant arrays.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: ffae57eb8d8f89bfbabdec614e2579e979321f6c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ffae57eb8d8f89bfbabdec614e257… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 16:17:47 2023 +1000 vkd3d-shader/dxil: Support null constant arrays. --- libs/vkd3d-shader/dxil.c | 14 ++++++++------ libs/vkd3d-shader/tpf.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index beb9ae57..7c711d7c 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2412,7 +2412,7 @@ static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, co return VKD3D_ERROR_INVALID_SHADER; } size = max(size, sizeof(icb->data[0])); - count = type->u.array.count * size / sizeof(icb->data[0]); + count = operands ? type->u.array.count * size / sizeof(icb->data[0]) : 0; if (!(icb = vkd3d_malloc(offsetof(struct vkd3d_shader_immediate_constant_buffer, data[count])))) { @@ -2436,6 +2436,10 @@ static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, co icb->data_type = vkd3d_data_type_from_sm6_type(elem_type); icb->element_count = type->u.array.count; icb->component_count = 1; + icb->is_null = !operands; + + if (!operands) + return VKD3D_OK; count = type->u.array.count; if (size > sizeof(icb->data[0])) @@ -2510,12 +2514,10 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const switch (record->code) { case CST_CODE_NULL: - if (sm6_type_is_array(type)) + if (sm6_type_is_array(type) + && (ret = value_allocate_constant_array(dst, type, NULL, sm6)) < 0) { - FIXME("Constant null arrays are not supported.\n"); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, - "Constant null arrays are not supported."); - return VKD3D_ERROR_INVALID_SHADER; + return ret; } /* For non-aggregates, register constant data is already zero-filled. */ break; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 80f8ab98..ba504c41 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -795,6 +795,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui icb->data_type = VKD3D_DATA_FLOAT; icb->component_count = VKD3D_VEC4_SIZE; icb->element_count = icb_size / VKD3D_VEC4_SIZE; + icb->is_null = false; memcpy(icb->data, tokens, sizeof(*tokens) * icb_size); shader_instruction_array_add_icb(&priv->p.instructions, icb); ins->declaration.icb = icb; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 267b467e..3458b8f5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -797,6 +797,7 @@ struct vkd3d_shader_immediate_constant_buffer /* total count is element_count * component_count */ unsigned int element_count; unsigned int component_count; + bool is_null; uint32_t data[]; };

1 0

Conor McCarthy : vkd3d-shader/spirv: Support constant initialisers in indexable temps.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 16cb6fdbadec90e29701f1469821fafc5fb98aff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/16cb6fdbadec90e29701f1469821f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 16:19:22 2023 +1000 vkd3d-shader/spirv: Support constant initialisers in indexable temps. --- libs/vkd3d-shader/spirv.c | 87 +++++++++++++++++++++++--- tests/hlsl/matrix-indexing.shader_test | 4 +- tests/hlsl/non-const-indexing.shader_test | 38 +++++------ tests/hlsl/vector-indexing-uniform.shader_test | 2 +- 4 files changed, 99 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2eee09d8..8cc124fd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1194,6 +1194,16 @@ static uint32_t vkd3d_spirv_get_op_constant64(struct vkd3d_spirv_builder *builde (const uint32_t *)&value, 2, vkd3d_spirv_build_op_constant64); } +static uint32_t vkd3d_spirv_build_op_constant_null(struct vkd3d_spirv_builder *builder, uint32_t result_type) +{ + return vkd3d_spirv_build_op_tr(builder, &builder->global_stream, SpvOpConstantNull, result_type); +} + +static uint32_t vkd3d_spirv_get_op_constant_null(struct vkd3d_spirv_builder *builder, uint32_t result_type) +{ + return vkd3d_spirv_build_once1(builder, SpvOpConstantNull, result_type, vkd3d_spirv_build_op_constant_null); +} + static uint32_t vkd3d_spirv_build_op_constant_composite(struct vkd3d_spirv_builder *builder, uint32_t result_type, const uint32_t *constituents, unsigned int constituent_count) { @@ -3756,6 +3766,61 @@ static uint32_t spirv_compiler_emit_load_scalar(struct spirv_compiler *compiler, return val_id; } +static uint32_t spirv_compiler_emit_constant_array(struct spirv_compiler *compiler, + const struct vkd3d_shader_immediate_constant_buffer *icb) +{ + uint32_t *elements, elem_type_id, length_id, type_id, const_id; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int i, element_count; + + element_count = icb->element_count; + + elem_type_id = vkd3d_spirv_get_type_id_for_data_type(builder, icb->data_type, 1); + length_id = spirv_compiler_get_constant_uint(compiler, element_count); + type_id = vkd3d_spirv_get_op_type_array(builder, elem_type_id, length_id); + + if (icb->is_null) + { + /* All values are null. Workgroup memory initialisers require OpConstantNull. */ + return vkd3d_spirv_get_op_constant_null(builder, type_id); + } + + if (!(elements = vkd3d_calloc(element_count, sizeof(*elements)))) + { + ERR("Failed to allocate %u elements.", element_count); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_OUT_OF_MEMORY, + "Failed to allocate %u constant array elements.", element_count); + return 0; + } + + switch (icb->data_type) + { + case VKD3D_DATA_FLOAT: + case VKD3D_DATA_INT: + case VKD3D_DATA_UINT: + for (i = 0; i < element_count; ++i) + elements[i] = vkd3d_spirv_get_op_constant(builder, elem_type_id, icb->data[i]); + break; + case VKD3D_DATA_DOUBLE: + case VKD3D_DATA_UINT64: + { + uint64_t *data = (uint64_t *)icb->data; + for (i = 0; i < element_count; ++i) + elements[i] = vkd3d_spirv_get_op_constant64(builder, elem_type_id, data[i]); + break; + } + default: + FIXME("Unhandled data type %u.\n", icb->data_type); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_TYPE, + "Immediate constant buffer data type %u is unhandled.", icb->data_type); + break; + } + + const_id = vkd3d_spirv_build_op_constant_composite(builder, type_id, elements, element_count); + vkd3d_free(elements); + return const_id; +} + static const struct ssa_register_info *spirv_compiler_get_ssa_register_info(const struct spirv_compiler *compiler, const struct vkd3d_shader_register *reg) { @@ -5493,37 +5558,39 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil { const struct vkd3d_shader_indexable_temp *temp = &instruction->declaration.indexable_temp; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t id, type_id, length_id, ptr_type_id, init_id = 0; enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; + SpvStorageClass storage_class; size_t function_location; - uint32_t id; + + storage_class = SpvStorageClassFunction; vsir_register_init(&reg, VKD3DSPR_IDXTEMP, VKD3D_DATA_FLOAT, 1); reg.idx[0].offset = temp->register_idx; if (temp->alignment) WARN("Ignoring alignment %u.\n", temp->alignment); - if (temp->initialiser) - { - FIXME("Initialisers are not supported.\n"); - spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED, - "Initialisers for indexable temps are not supported."); - } function_location = spirv_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location); component_type = vkd3d_component_type_from_data_type(temp->data_type); - id = spirv_compiler_emit_array_variable(compiler, &builder->function_stream, - SpvStorageClassFunction, component_type, temp->component_count, &temp->register_size, 1); + type_id = vkd3d_spirv_get_type_id(builder, component_type, temp->component_count); + length_id = spirv_compiler_get_constant_uint(compiler, temp->register_size); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); + if (temp->initialiser) + init_id = spirv_compiler_emit_constant_array(compiler, temp->initialiser); + id = vkd3d_spirv_build_op_variable(builder, &builder->function_stream, ptr_type_id, storage_class, init_id); spirv_compiler_emit_register_debug_name(builder, id, &reg); vkd3d_spirv_end_function_stream_insertion(builder); vkd3d_symbol_make_register(&reg_symbol, &reg); - vkd3d_symbol_set_register_info(&reg_symbol, id, SpvStorageClassFunction, + vkd3d_symbol_set_register_info(&reg_symbol, id, storage_class, component_type, vkd3d_write_mask_from_component_count(temp->component_count)); spirv_compiler_put_symbol(compiler, &reg_symbol); } diff --git a/tests/hlsl/matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test index 5024c8ed..f44ba63e 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -120,7 +120,7 @@ float4 main() : sv_target [test] uniform 0 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (8, 9, 10, 11) @@ -136,5 +136,5 @@ float4 main() : sv_target [test] uniform 0 float 3 -todo(sm>=6) draw quad +draw quad probe all rgba (12, 13, 14, 15) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index 3a1e12ac..5c8e1db4 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -36,16 +36,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 -todo(sm>=6) draw quad +draw quad probe all rgba (11.0, 11.0, 11.0, 11.0) uniform 0 float 1 -todo(sm>=6) draw quad +draw quad probe all rgba (12.0, 12.0, 12.0, 12.0) uniform 0 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (13.0, 13.0, 13.0, 13.0) uniform 0 float 3 -todo(sm>=6) draw quad +draw quad probe all rgba (14.0, 14.0, 14.0, 14.0) @@ -61,8 +61,8 @@ float4 main() : sv_target [test] uniform 0 float 2.3 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (3, 3, 3, 3) +draw quad +probe all rgba (3, 3, 3, 3) [pixel shader] @@ -77,16 +77,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 -todo(sm>=6) draw quad +draw quad probe all rgba (21.0, 1.0, 24.0, 0.0) uniform 0 float 1 -todo(sm>=6) draw quad +draw quad probe all rgba (22.0, 0.0, 23.0, 1.0) uniform 0 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (23.0, 1.0, 22.0, 0.0) uniform 0 float 3 -todo(sm>=6) draw quad +draw quad probe all rgba (24.0, 0.0, 21.0, 1.0) @@ -102,17 +102,17 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 0 0 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (1.0, 2.0, 3.0, 4.0) +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) uniform 0 float4 1 0 0 0 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0) +draw quad +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 0 1 0 0 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0) +draw quad +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 1 1 0 0 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (9.0, 10.0, 11.0, 12.0) +draw quad +probe all rgba (9.0, 10.0, 11.0, 12.0) [pixel shader] @@ -130,7 +130,7 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 2.4 0 -todo(sm>=6) draw quad +draw quad probe all rgba (1.0, 120.0, 90.0, 4.0) diff --git a/tests/hlsl/vector-indexing-uniform.shader_test b/tests/hlsl/vector-indexing-uniform.shader_test index 3501f3af..e5ffbdd0 100644 --- a/tests/hlsl/vector-indexing-uniform.shader_test +++ b/tests/hlsl/vector-indexing-uniform.shader_test @@ -12,5 +12,5 @@ float4 main() : SV_TARGET [test] uniform 0 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (0.5, 0.3, 0.8, 0.2)

1 0