October 2022 - Wine-commits

Vladislav Timonin : d2d1: Update to ID2D1Device1.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 34640a94b3092a83da6194655d8d1d60260c2fe7 URL: https://gitlab.winehq.org/wine/wine/-/commit/34640a94b3092a83da6194655d8d1d… Author: Vladislav Timonin <timoninvlad(a)yandex.ru> Date: Sat Oct 29 00:40:31 2022 +0700 d2d1: Update to ID2D1Device1. --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 66 +++++++++++++++++++++++++++++++++--------------- dlls/d2d1/factory.c | 21 +++++++++------ dlls/d2d1/tests/d2d1.c | 15 +++++++++++ 4 files changed, 74 insertions(+), 30 deletions(-)

1 0

Vladislav Timonin : d2d1: Implement ID2D1Device1::CreateDeviceContext.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 4e734f48eb07c3d981829fc04d081b67feca9ed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e734f48eb07c3d981829fc04d081b… Author: Vladislav Timonin <timoninvlad(a)yandex.ru> Date: Sat Oct 29 17:28:57 2022 +0700 d2d1: Implement ID2D1Device1::CreateDeviceContext. --- dlls/d2d1/device.c | 21 +++++++++++++-------- dlls/d2d1/tests/d2d1.c | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ed7b43e05da..72781a48d10 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4534,14 +4534,11 @@ static void WINAPI d2d_device_GetFactory(ID2D1Device1 *iface, ID2D1Factory **fac ID2D1Factory1_AddRef(device->factory); } -static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, - ID2D1DeviceContext **context) -{ +static HRESULT d2d_device_create_device_context(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext1 **context) { struct d2d_device_context *object; HRESULT hr; - TRACE("iface %p, options %#x, context %p.\n", iface, options, context); - if (options) FIXME("Options are ignored %#x.\n", options); @@ -4556,11 +4553,19 @@ static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device1 *iface, D2D1_D } TRACE("Created device context %p.\n", object); - *context = (ID2D1DeviceContext *)&object->ID2D1DeviceContext1_iface; + *context = &object->ID2D1DeviceContext1_iface; return S_OK; } +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + TRACE("iface %p, options %#x, context %p.\n", iface, options, context); + + return d2d_device_create_device_context(iface, options, (ID2D1DeviceContext1 **)context); +} + static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device1 *iface, IWICImagingFactory *wic_factory, IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, ID2D1PrintControl **print_control) @@ -4605,9 +4610,9 @@ static void WINAPI d2d_device_SetRenderingPriority(ID2D1Device1 *iface, D2D1_REN static HRESULT WINAPI d2d_device_CreateDeviceContext1(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, ID2D1DeviceContext1 **context) { - FIXME("iface %p, options %#x, context %p.\n", iface, options, context); + TRACE("iface %p, options %#x, context %p.\n", iface, options, context); - return E_NOTIMPL; + return d2d_device_create_device_context(iface, options, context); } static const struct ID2D1Device1Vtbl d2d_device_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7560e44409e..99a1013a333 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9199,9 +9199,9 @@ static void test_device_context(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Device1_CreateDeviceContext(device1, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context1); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (hr == S_OK) ID2D1DeviceContext1_Release(device_context1); + ID2D1DeviceContext1_Release(device_context1); ID2D1Device1_Release(device1); }

1 0

Zebediah Figura : tests: Fix constructor declaration in the partial UAV write test.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 52069386c492c48b8dc0cbc7977a8ad835a9c283 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/52069386c492c48b8dc0cbc7977a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 25 23:14:43 2022 -0500 tests: Fix constructor declaration in the partial UAV write test. Make sure the test fails for the right reason. Spotted by Francisco Casas. --- tests/uav.shader_test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/uav.shader_test b/tests/uav.shader_test index 09ca05ec..297cf14a 100644 --- a/tests/uav.shader_test +++ b/tests/uav.shader_test @@ -7,8 +7,8 @@ RWTexture2D<float4> u; float4 main() : sv_target { /* All four components must be written in a single statement. */ - u[uint2(0, 0)].xy = float4(1, 2); - u[uint2(0, 0)].zw = float4(3, 4); + u[uint2(0, 0)].xy = float2(1, 2); + u[uint2(0, 0)].zw = float2(3, 4); return 0; }

1 0

Zebediah Figura : tests: Add more tests for UAV allocation.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 8044fce040619235f69534441515c4ce68d1b5ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8044fce040619235f69534441515c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 13 23:03:24 2022 -0500 tests: Add more tests for UAV allocation. --- tests/uav.shader_test | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/uav.shader_test b/tests/uav.shader_test index 297cf14a..bc2fcb4d 100644 --- a/tests/uav.shader_test +++ b/tests/uav.shader_test @@ -22,6 +22,7 @@ float4 main() : sv_target return 0; } + [uav 1] format r32 float size (2, 2) @@ -54,3 +55,68 @@ probe uav 1 (0, 1) r (0.6) probe uav 1 (1, 0) r (0.2) probe uav 1 (1, 1) r (0.7) probe uav 2 (0, 0) rgba (2.0, 1.0, 4.0, 3.0) + + +% UAVs are implicitly allocated starting from the highest render target slot. +% They cannot overlap render target slots, and also cannot be allocated any +% lower than the highest render target. +% This ceases to be true with shader model 5.1. + +[render target 1] +format r32g32b32a32 float +size (640, 480) + +[uav 2] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[pixel shader fail] +RWTexture2D<float4> u : register(u0); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[pixel shader fail] +RWTexture2D<float4> u : register(u1); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[pixel shader] +RWTexture2D<float4> u; + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[test] +todo draw quad +probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) + + +[uav 3] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[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] +todo draw quad +probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)

1 0

Francisco Casas : tests: Add a test for storing to a UAV array.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 4096d453c40b14d25c4561bc2e00f4e72ec62a06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4096d453c40b14d25c4561bc2e00f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Oct 25 23:44:00 2022 -0500 tests: Add a test for storing to a UAV array. --- tests/uav.shader_test | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/uav.shader_test b/tests/uav.shader_test index bc2fcb4d..8048af16 100644 --- a/tests/uav.shader_test +++ b/tests/uav.shader_test @@ -120,3 +120,30 @@ float4 main() : sv_target1 [test] todo 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] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[uav 3] +size (1, 1) + +0.5 0.6 0.7 0.8 + +[pixel shader] +RWTexture2D<float4> u[2] : register(u2); + +float4 main() : sv_target1 +{ + u[0][uint2(0, 0)] = float4(1.1, 1.2, 1.3, 1.4); + u[1][uint2(0, 0)] = float4(2.1, 2.2, 2.3, 2.4); + return 0; +} + +[test] +todo draw quad +probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4) +probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allocate UAVs.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 2ec67e0f104da7cb8002f7deacd67f15bbbfa284 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2ec67e0f104da7cb8002f7deacd67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 21:26:15 2021 -0500 vkd3d-shader/hlsl: Allocate UAVs. --- libs/vkd3d-shader/hlsl_codegen.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index aacaa95c..3e36aa05 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2284,6 +2284,7 @@ object_types[] = { { HLSL_TYPE_SAMPLER, 's' }, { HLSL_TYPE_TEXTURE, 't' }, + { HLSL_TYPE_UAV, 'u' }, }; static const struct object_type_info *get_object_type_info(enum hlsl_base_type type) @@ -2302,7 +2303,20 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) { const struct object_type_info *type_info = get_object_type_info(type); struct hlsl_ir_var *var; - uint32_t index = 0; + uint32_t min_index = 0; + uint32_t index; + + if (type == HLSL_TYPE_UAV) + { + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (var->semantic.name && (!ascii_strcasecmp(var->semantic.name, "color") + || !ascii_strcasecmp(var->semantic.name, "sv_target"))) + min_index = max(min_index, var->semantic.index + 1); + } + } + + index = min_index; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -2315,7 +2329,13 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) const struct hlsl_ir_var *reserved_object = get_reserved_object(ctx, type_info->reg_name, var->reg_reservation.index); - if (reserved_object && reserved_object != var) + if (var->reg_reservation.index < min_index) + { + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, + "UAV index (%u) must be higher than the maximum render target index (%u).", + var->reg_reservation.index, min_index - 1); + } + else if (reserved_object && reserved_object != var) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, "Multiple objects bound to %c%u.", type_info->reg_name, @@ -2578,6 +2598,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { allocate_buffers(ctx); allocate_objects(ctx, HLSL_TYPE_TEXTURE); + allocate_objects(ctx, HLSL_TYPE_UAV); } allocate_semantic_registers(ctx); allocate_objects(ctx, HLSL_TYPE_SAMPLER);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 UAV declarations.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 12e397de9a7ce4bc32269d5578accb6a948d08c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12e397de9a7ce4bc32269d5578acc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 15 13:03:28 2021 -0500 vkd3d-shader/hlsl: Write SM4 UAV declarations. --- libs/vkd3d-shader/hlsl_sm4.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8ca37f3f..7884b4e7 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1140,12 +1140,13 @@ static void write_sm4_dcl_sampler(struct vkd3d_bytecode_buffer *buffer, const st static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) { + bool uav = (var->data_type->base_type == HLSL_TYPE_UAV); const struct sm4_instruction instr = { - .opcode = VKD3D_SM4_OP_DCL_RESOURCE + .opcode = (uav ? VKD3D_SM5_OP_DCL_UAV_TYPED : VKD3D_SM4_OP_DCL_RESOURCE) | (sm4_resource_dimension(var->data_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT), - .dsts[0].reg.type = VKD3D_SM4_RT_RESOURCE, + .dsts[0].reg.type = uav ? VKD3D_SM5_RT_UAV : VKD3D_SM4_RT_RESOURCE, .dsts[0].reg.idx = {var->reg.id}, .dsts[0].reg.idx_count = 1, .dst_count = 1, @@ -2302,7 +2303,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (var->data_type->base_type == HLSL_TYPE_SAMPLER) write_sm4_dcl_sampler(&buffer, var); - else if (var->data_type->base_type == HLSL_TYPE_TEXTURE) + else if (var->data_type->base_type == HLSL_TYPE_TEXTURE || var->data_type->base_type == HLSL_TYPE_UAV) write_sm4_dcl_texture(&buffer, var); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Implement typed UAV loads.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 0a2aaa690ea9d7c5fd9fef07bc9a37c6aaf2fc77 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a2aaa690ea9d7c5fd9fef07bc9a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 15 12:05:54 2021 -0500 vkd3d-shader/hlsl: Implement typed UAV loads. --- libs/vkd3d-shader/hlsl.y | 3 ++- libs/vkd3d-shader/hlsl_sm4.c | 30 ++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7ada218c..d76ea92e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -786,7 +786,8 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; struct hlsl_ir_expr *cast; - if (expr_type->type == HLSL_CLASS_OBJECT && expr_type->base_type == HLSL_TYPE_TEXTURE + if (expr_type->type == HLSL_CLASS_OBJECT + && (expr_type->base_type == HLSL_TYPE_TEXTURE || expr_type->base_type == HLSL_TYPE_UAV) && expr_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) { struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 7884b4e7..f31ee169 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -855,6 +855,16 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->idx_count = 1; *writemask = VKD3DSP_WRITEMASK_ALL; } + else if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_UAV) + { + reg->type = VKD3D_SM5_RT_UAV; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; + reg->idx[0] = var->reg.id; + reg->idx_count = 1; + *writemask = VKD3DSP_WRITEMASK_ALL; + } else if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_SAMPLER) { reg->type = VKD3D_SM4_RT_SAMPLER; @@ -1397,24 +1407,28 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, const struct hlsl_deref *resource, const struct hlsl_ir_node *coords) { + bool uav = (resource_type->base_type == HLSL_TYPE_UAV); struct sm4_instruction instr; unsigned int dim_count; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_LD; + instr.opcode = uav ? VKD3D_SM5_OP_LD_UAV_TYPED : VKD3D_SM4_OP_LD; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); - /* Mipmap level is in the last component in the IR, but needs to be in the W - * component in the instruction. */ - dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim); - if (dim_count == 1) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); - if (dim_count == 2) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); + if (!uav) + { + /* Mipmap level is in the last component in the IR, but needs to be in the W + * component in the instruction. */ + dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim); + if (dim_count == 1) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + if (dim_count == 2) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); + } sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse UAV stores.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 03f9d16047ddd09d18d441af9cd519c88dbfa132 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/03f9d16047ddd09d18d441af9cd51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 15 12:08:32 2021 -0500 vkd3d-shader/hlsl: Parse UAV stores. --- libs/vkd3d-shader/hlsl.c | 52 ++++++++++++++++++++++++++++++++++++---- libs/vkd3d-shader/hlsl.h | 17 +++++++++++++ libs/vkd3d-shader/hlsl.y | 51 +++++++++++++++++++++++++++++++++++---- libs/vkd3d-shader/hlsl_codegen.c | 17 +++++++++++++ 4 files changed, 127 insertions(+), 10 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 UAV store instructions.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: vkd3d Branch: master Commit: 9bdae4dfaad3ace7336768463e139c0f67fc8f95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9bdae4dfaad3ace7336768463e139… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 15 12:24:55 2021 -0500 vkd3d-shader/hlsl: Write SM4 UAV store instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f31ee169..d3e1cbfa 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1608,6 +1608,24 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, } } +static void write_sm4_store_uav_typed(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_deref *dst, const struct hlsl_ir_node *coords, const struct hlsl_ir_node *value) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM5_OP_STORE_UAV_TYPED; + + sm4_register_from_deref(ctx, &instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst, dst->var->data_type); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); + sm4_src_from_node(&instr.srcs[1], value, VKD3DSP_WRITEMASK_ALL); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { @@ -2176,6 +2194,27 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, } } +static void write_sm4_resource_store(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_store *store) +{ + const struct hlsl_type *resource_type = store->resource.var->data_type; + + if (resource_type->type != HLSL_CLASS_OBJECT) + { + assert(resource_type->type == HLSL_CLASS_ARRAY || resource_type->type == HLSL_CLASS_STRUCT); + hlsl_fixme(ctx, &store->node.loc, "Resource being a component of another variable."); + return; + } + + if (!store->resource.var->is_uniform) + { + hlsl_fixme(ctx, &store->node.loc, "Store to non-uniform resource variable."); + return; + } + + write_sm4_store_uav_typed(ctx, buffer, &store->resource, store->coords.node, store->value.node); +} + static void write_sm4_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_store *store) { @@ -2261,6 +2300,10 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * write_sm4_resource_load(ctx, buffer, hlsl_ir_resource_load(instr)); break; + case HLSL_IR_RESOURCE_STORE: + write_sm4_resource_store(ctx, buffer, hlsl_ir_resource_store(instr)); + break; + case HLSL_IR_LOOP: write_sm4_loop(ctx, buffer, hlsl_ir_loop(instr)); break;

1 0