April 2023 - Wine-Commits - list.winehq.org

Conor McCarthy : tests: Test null addresses in test_update_root_descriptors().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 5244fa572f2a97616697bed4dc4bab36f378f7e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5244fa572f2a97616697bed4dc4ba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:01:41 2023 +1000 tests: Test null addresses in test_update_root_descriptors(). --- tests/d3d12.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ae16fddf..0997f696 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16425,7 +16425,7 @@ static void test_update_root_descriptors(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_GPU_VIRTUAL_ADDRESS cb_va, uav_va; - D3D12_ROOT_PARAMETER root_parameters[2]; + D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12GraphicsCommandList *command_list; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; @@ -16498,8 +16498,12 @@ static void test_update_root_descriptors(void) root_parameters[1].Descriptor.ShaderRegister = 0; root_parameters[1].Descriptor.RegisterSpace = 0; root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV; + root_parameters[2].Descriptor.ShaderRegister = 0; + root_parameters[2].Descriptor.RegisterSpace = 0; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; memset(&root_signature_desc, 0, sizeof(root_signature_desc)); - root_signature_desc.NumParameters = 2; + root_signature_desc.NumParameters = 3; root_signature_desc.pParameters = root_parameters; hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); @@ -16509,6 +16513,9 @@ static void test_update_root_descriptors(void) ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); + ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 0, 0); + ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, 1, 0); + ID3D12GraphicsCommandList_SetComputeRootShaderResourceView(command_list, 2, 0); for (i = 0; i < ARRAY_SIZE(input); ++i) { ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,

1 0

Conor McCarthy : vkd3d: Support null address for SRV/UAV root descriptors.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 0526f232cd739dcde429716c763ea5eeecfaaf70 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0526f232cd739dcde429716c763ea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:00:36 2023 +1000 vkd3d: Support null address for SRV/UAV root descriptors. --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/resource.c | 16 +++++++++++++++- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 492f0bec..f9bd5311 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4556,13 +4556,13 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li assert(root_parameter->parameter_type != D3D12_ROOT_PARAMETER_TYPE_CBV); /* FIXME: Re-use buffer views. */ - if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view)) + if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, root_parameter->parameter_type, &vk_buffer_view)) { ERR("Failed to create buffer view.\n"); return; } - if (!(d3d12_command_allocator_add_buffer_view(list->allocator, vk_buffer_view))) + if (vk_buffer_view && !(d3d12_command_allocator_add_buffer_view(list->allocator, vk_buffer_view))) { ERR("Failed to add buffer view.\n"); VK_CALL(vkDestroyBufferView(vk_device, vk_buffer_view, NULL)); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 275e31b0..7915291d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3282,12 +3282,26 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d } bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, - D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view) + D3D12_GPU_VIRTUAL_ADDRESS gpu_address, D3D12_ROOT_PARAMETER_TYPE parameter_type, VkBufferView *vk_buffer_view) { const struct vkd3d_format *format; struct d3d12_resource *resource; format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + + if (!gpu_address) + { + if (device->vk_info.EXT_robustness2) + { + *vk_buffer_view = VK_NULL_HANDLE; + return true; + } + WARN("Creating null buffer view.\n"); + return vkd3d_create_vk_buffer_view(device, parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV + ? device->null_resources.vk_storage_buffer : device->null_resources.vk_buffer, + format, 0, VK_WHOLE_SIZE, vk_buffer_view); + } + resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); assert(d3d12_resource_is_buffer(resource)); return vkd3d_create_vk_buffer_view(device, resource->u.vk_buffer, format, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1a277a47..ab88f8bf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -762,7 +762,7 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device * void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, - D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); + D3D12_GPU_VIRTUAL_ADDRESS gpu_address, D3D12_ROOT_PARAMETER_TYPE parameter_type, VkBufferView *vk_buffer_view); HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle uppercase regset names in packoffset().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 827a359b450a7ba8fa4f0ab9ef6eb172f3b36f2b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/827a359b450a7ba8fa4f0ab9ef6eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 16 19:43:14 2023 +0200 vkd3d-shader/hlsl: Handle uppercase regset names in packoffset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- tests/cbuffer.shader_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c9c9495b..3403c87b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1035,7 +1035,7 @@ static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const return reservation; } - reservation.offset_type = reg_string[0]; + reservation.offset_type = ascii_tolower(reg_string[0]); if (reservation.offset_type != 'c') { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 86e03607..7e2a91dc 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -156,7 +156,7 @@ float4 main() : sv_target cbuffer buffer { float4 a : packoffset(c1); - float4 b : packoffset(c2); + float4 b : packoffset(C2); } float4 main() : sv_target

1 0

Conor McCarthy : tests: Test index buffer location zero in test_draw_indexed_instanced().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: db7359f36a635606e124d38da505fe2c5df30159 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/db7359f36a635606e124d38da505f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:09:23 2023 +1000 tests: Test index buffer location zero in test_draw_indexed_instanced(). Only verify it doesn't crash. --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0997f696..bc01cadb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5367,7 +5367,6 @@ static void test_draw_indexed_instanced(void) ib = create_upload_buffer(context.device, sizeof(indices), indices); - ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); ibv.SizeInBytes = sizeof(indices); ibv.Format = DXGI_FORMAT_R16_UINT; @@ -5384,6 +5383,9 @@ static void test_draw_indexed_instanced(void) ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, NULL); + ibv.BufferLocation = 0; + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);

1 0

Ethan Lee : vkd3d-shader/hlsl: Add support for any() intrinsic.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 0668d32631cb4b393375be18d2eed6f999bebc8f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0668d32631cb4b393375be18d2eed… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Thu Apr 6 23:59:04 2023 -0400 vkd3d-shader/hlsl: Add support for any() intrinsic. For now, this is limited to float and bool, scalar and vector. All other types are unsupported. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/hlsl.y | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3403c87b..b8b57d27 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2435,6 +2435,55 @@ static bool intrinsic_all(struct hlsl_ctx *ctx, return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, mul, zero, loc); } +static bool intrinsic_any(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg = params->args[0], *dot, *or, *zero, *bfalse; + struct hlsl_ir_load *load; + unsigned int i, count; + + if (arg->data_type->class != HLSL_CLASS_VECTOR && arg->data_type->class != HLSL_CLASS_SCALAR) + { + hlsl_fixme(ctx, loc, "any() implementation for non-vector, non-scalar"); + return false; + } + + if (arg->data_type->base_type == HLSL_TYPE_FLOAT) + { + if (!(zero = hlsl_new_float_constant(ctx, 0.0f, loc))) + return false; + list_add_tail(params->instrs, &zero->entry); + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc))) + return false; + + return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, dot, zero, loc); + } + else if (arg->data_type->base_type == HLSL_TYPE_BOOL) + { + if (!(bfalse = hlsl_new_bool_constant(ctx, false, loc))) + return false; + list_add_tail(params->instrs, &bfalse->entry); + + or = bfalse; + + count = hlsl_type_component_count(arg->data_type); + for (i = 0; i < count; ++i) + { + if (!(load = add_load_component(ctx, params->instrs, arg, i, loc))) + return false; + + if (!(or = add_binary_bitwise_expr(ctx, params->instrs, HLSL_OP2_BIT_OR, or, &load->node, loc))) + return false; + } + + return true; + } + + hlsl_fixme(ctx, loc, "any() implementation for non-float, non-bool"); + return false; +} + /* Find the type corresponding to the given source type, with the same * dimensions but a different base type. */ static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, @@ -3284,6 +3333,7 @@ intrinsic_functions[] = /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"all", 1, true, intrinsic_all}, + {"any", 1, true, intrinsic_any}, {"asuint", -1, true, intrinsic_asuint}, {"clamp", 3, true, intrinsic_clamp}, {"cos", 1, true, intrinsic_cos},

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix missing extern resource names.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 3f9cd58f5b74c43af8a951eb159731e33f5cc2d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3f9cd58f5b74c43af8a951eb15973… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 18 00:20:24 2023 -0400 vkd3d-shader/hlsl: Fix missing extern resource names. --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 22b6f6b9..47bc1fed 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -653,7 +653,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) var = extern_resources[i]; string_offset = put_string(&buffer, var->name); - set_u32(&buffer, resources_offset + i++ * 8 * sizeof(uint32_t), string_offset); + set_u32(&buffer, resources_offset + i * 8 * sizeof(uint32_t), string_offset); } LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry)

1 0

Giovanni Mascellani : tests: Pop the shader runner context after processing the current section.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 625155bd3cc2812707ebb51ddf615a9c85e1c559 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/625155bd3cc2812707ebb51ddf615… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 14:53:24 2023 +0200 tests: Pop the shader runner context after processing the current section. This way failures produced while compiling or preprocessing a shader are shown with the appropriate context. --- tests/shader_runner.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 9922496b..58ed2d98 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -780,9 +780,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o if (!ret || line[0] == '[') { - if (state != STATE_NONE) - vkd3d_test_pop_context(); - switch (state) { case STATE_INPUT_LAYOUT: @@ -793,7 +790,10 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o case STATE_REQUIRE: if (runner->ops->check_requirements && !runner->ops->check_requirements(runner)) + { + vkd3d_test_pop_context(); goto out; + } break; case STATE_RESOURCE: @@ -884,6 +884,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o break; } } + + if (state != STATE_NONE) + vkd3d_test_pop_context(); } if (!ret)

1 0

Conor McCarthy : vkd3d: Check for index buffer location zero.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 333fdf7c74815f2ea84a117f18aaf7aa0ebbc2a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/333fdf7c74815f2ea84a117f18aaf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:07:38 2023 +1000 vkd3d: Check for index buffer location zero. VK_EXT_robustness2 does not support null index buffers so we only warn and return immediately. --- libs/vkd3d/command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f9bd5311..2662ec04 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4653,6 +4653,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics WARN("Ignoring NULL index buffer view.\n"); return; } + if (!view->BufferLocation) + { + WARN("Ignoring index buffer location 0.\n"); + return; + } vk_procs = &list->device->vk_procs;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle uppercase regset names in register().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 0cea4d352e5f04fe6837702b91ce993928a37566 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0cea4d352e5f04fe6837702b91ce9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 16 19:38:58 2023 +0200 vkd3d-shader/hlsl: Handle uppercase regset names in register(). --- libs/vkd3d-shader/hlsl.y | 2 +- tests/cbuffer.shader_test | 21 +++++++++++++++++++-- tests/uav.shader_test | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2eed17af..c9c9495b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1014,7 +1014,7 @@ static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) FIXME("Unsupported register reservation syntax.\n"); return reservation; } - reservation.reg_type = reg_string[0]; + reservation.reg_type = ascii_tolower(reg_string[0]); return reservation; } diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 9cf42d9d..86e03607 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -1,3 +1,21 @@ +% Uppercase register set names +[pixel shader] +cbuffer Constants : register(B1) +{ +}; +Texture2D tex : register(T1); +float4 foo : register(C0); + +float4 main() : sv_target +{ + return foo; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + [pixel shader] // Test empty constant buffer. cbuffer Constants : register(b1) @@ -16,7 +34,6 @@ uniform 0 float4 1.0 2.0 3.0 4.0 draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) - % SM1 buffer offset allocation follows different rules than SM4. % Those would have to be tested separately. [require] @@ -611,7 +628,7 @@ float4 main() : sv_target cbuffer buffer { float4 foo : packoffset(c0); - Texture2D tex : register(t1); + Texture2D tex : register(T1); } float4 main() : sv_target diff --git a/tests/uav.shader_test b/tests/uav.shader_test index 0c690f8e..f0eade4d 100644 --- a/tests/uav.shader_test +++ b/tests/uav.shader_test @@ -121,6 +121,20 @@ float4 main() : sv_target1 draw quad probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) +% Uppercase register set name +[pixel shader] +RWTexture2D<float4> u : register(U3); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[test] +draw quad +probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) + % Test that we can declare and use an array of UAVs. [uav 2]

1 0

Zebediah Figura : vkd3d-shader/spirv: Do not declare resources as multisampled if the sample count is 1.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: d8ef0c69a817d059b1d4fc62520131eed80aba29 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8ef0c69a817d059b1d4fc6252013… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 14:37:18 2023 -0500 vkd3d-shader/spirv: Do not declare resources as multisampled if the sample count is 1. It is illegal to match a SPIR-V multisampled resource to a Vulkan resource which is not multisampled. Vulkan considers a resource to be multisampled if its sample count is greater than 1 (and SPIR-V does not care about the sample count). This fixes validation errors in the case where the sample count does actually match the resource. In order to provide correct behaviour when there is a mismatch, or when the sample count is missing, we will need yet another additional interface. In the absence of that it seems best to provide a best guess. This fixes a validation error with the not-yet-committed merge request 135, when the d3d11 runner is run through Wine with the Vulkan backend. --- libs/vkd3d-shader/spirv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 73510f8b..ec4e1d1d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6039,6 +6039,7 @@ static void spirv_compiler_emit_dcl_resource(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_resource_type resource_type = semantic->resource_type; uint32_t flags = instruction->flags; /* We don't distinguish between APPEND and COUNTER UAVs. */ @@ -6046,8 +6047,13 @@ static void spirv_compiler_emit_dcl_resource(struct spirv_compiler *compiler, if (flags) FIXME("Unhandled UAV flags %#x.\n", flags); + if (resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMS && semantic->sample_count == 1) + resource_type = VKD3D_SHADER_RESOURCE_TEXTURE_2D; + else if (resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY && semantic->sample_count == 1) + resource_type = VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY; + spirv_compiler_emit_resource_declaration(compiler, &semantic->resource, - semantic->resource_type, semantic->resource_data_type[0], 0, false); + resource_type, semantic->resource_data_type[0], 0, false); } static void spirv_compiler_emit_dcl_resource_raw(struct spirv_compiler *compiler, @@ -8046,7 +8052,7 @@ static void spirv_compiler_emit_ld(struct spirv_compiler *compiler, image_operands[image_operand_count++] = spirv_compiler_emit_texel_offset(compiler, instruction, image.resource_type_info); } - if (multisample) + if (multisample && image.resource_type_info->ms) { operands_mask |= SpvImageOperandsSampleMask; image_operands[image_operand_count++] = spirv_compiler_emit_load_src(compiler,

1 0