Conor McCarthy : vkd3d-shader/dxil: Handle raw and structured buffers in sm6_parser_emit_dx_buffer_store().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: cab8b781ab39f1b917b2ce668cecf44b5cc90a53
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/cab8b781ab39f1b917b2ce668cecf4...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Thu Feb  1 16:05:35 2024 +1000

vkd3d-shader/dxil: Handle raw and structured buffers in sm6_parser_emit_dx_buffer_store().

---

 libs/vkd3d-shader/dxil.c                      | 57 +++++++++++++++++++++++++++
 tests/hlsl/uav-rwstructuredbuffer.shader_test |  8 ++--
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index d461fad2..5d98a38c 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4138,6 +4138,57 @@ static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_i
     instruction_dst_param_init_ssa_vector(ins, component_count, sm6);
 }
 
+static void sm6_parser_emit_dx_raw_buffer_store(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
+        const struct sm6_value **operands, struct function_emission_state *state)
+{
+    unsigned int write_mask, component_count, operand_count;
+    struct vkd3d_shader_src_param *src_params;
+    struct vkd3d_shader_dst_param *dst_param;
+    struct vkd3d_shader_instruction *ins;
+    struct vkd3d_shader_register data;
+    const struct sm6_value *resource;
+    bool raw;
+
+    resource = operands[0];
+    if (!sm6_value_validate_is_handle(resource, sm6))
+        return;
+    raw = resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER;
+
+    write_mask = sm6_value_get_constant_uint(operands[7]);
+    if (!write_mask || write_mask > VKD3DSP_WRITEMASK_ALL)
+    {
+        WARN("Invalid write mask %#x.\n", write_mask);
+        vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND,
+                "Write mask %#x for a raw/structured buffer store operation is invalid.", write_mask);
+        return;
+    }
+    else if (write_mask & (write_mask + 1))
+    {
+        /* In this case, it is unclear which source operands will be defined unless we encounter it in a shader. */
+        FIXME("Unhandled write mask %#x.\n", write_mask);
+        vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND,
+                "Write mask %#x for a raw/structured buffer store operation is unhandled.", write_mask);
+    }
+    component_count = vsir_write_mask_component_count(write_mask);
+
+    if (!sm6_parser_emit_composite_construct(sm6, &operands[3], component_count, state, &data))
+        return;
+
+    ins = state->ins;
+    vsir_instruction_init(ins, &sm6->p.location, raw ? VKD3DSIH_STORE_RAW : VKD3DSIH_STORE_STRUCTURED);
+    operand_count = 2 + !raw;
+
+    if (!(src_params = instruction_src_params_alloc(ins, operand_count, sm6)))
+        return;
+    src_params_init_from_operands(src_params, &operands[1], operand_count - 1);
+    data.data_type = VKD3D_DATA_UINT;
+    src_param_init_vector_from_reg(&src_params[operand_count - 1], &data);
+
+    dst_param = instruction_dst_params_alloc(ins, 1, sm6);
+    dst_param_init_with_mask(dst_param, write_mask);
+    dst_param->reg = resource->u.handle.reg;
+}
+
 static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
         const struct sm6_value **operands, struct function_emission_state *state)
 {
@@ -4194,6 +4245,12 @@ static void sm6_parser_emit_dx_buffer_store(struct sm6_parser *sm6, enum dx_intr
     if (!sm6_value_validate_is_handle(resource, sm6))
         return;
 
+    if (resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER
+            || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER)
+    {
+        return sm6_parser_emit_dx_raw_buffer_store(sm6, op, operands, state);
+    }
+
     if (resource->u.handle.d->kind != RESOURCE_KIND_TYPEDBUFFER)
     {
         WARN("Resource is not a typed buffer.\n");
diff --git a/tests/hlsl/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test
index d2fe7a3f..15026d06 100644
--- a/tests/hlsl/uav-rwstructuredbuffer.shader_test
+++ b/tests/hlsl/uav-rwstructuredbuffer.shader_test
@@ -34,8 +34,8 @@ float4 main() : sv_target1
 
 [test]
 todo(sm<6) draw quad
-todo probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4)
-todo probe uav 2 (1) rgba (15.5, 16.6, 17.7, 18.8)
+probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4)
+probe uav 2 (1) rgba (15.5, 16.6, 17.7, 18.8)
 
 [pixel shader todo]
 struct s
@@ -154,5 +154,5 @@ float4 main() : sv_target1
 
 [test]
 todo(sm<6) draw quad
-todo probe uav 2 (0) rgbai (11, -12, 13, -14)
-todo probe uav 2 (1) rgbai (-15, 16, -17, 18)
+probe uav 2 (0) rgbai (11, -12, 13, -14)
+probe uav 2 (1) rgbai (-15, 16, -17, 18)