Zebediah Figura : vkd3d-shader/hlsl: Propagate copies for resource store instructions.

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Tue Apr  5 18:26:22 2022 -0500

vkd3d-shader/hlsl: Propagate copies for resource store instructions.

---

libs/vkd3d-shader/hlsl_codegen.c | 13 +++++++++++++
 tests/uav.shader_test            |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 2ebfa87b..6e650db0 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -790,6 +790,15 @@ static bool copy_propagation_transform_resource_load(struct hlsl_ctx *ctx,
     return progress;
 }

+static bool copy_propagation_transform_resource_store(struct hlsl_ctx *ctx,
+        struct hlsl_ir_resource_store *store, struct copy_propagation_state *state)
+{
+    bool progress = false;
+
+    progress |= copy_propagation_transform_object_load(ctx, &store->resource, state);
+    return progress;
+}
+
 static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_store *store,
         struct copy_propagation_state *state)
 {
@@ -936,6 +945,10 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b
                 progress |= copy_propagation_transform_resource_load(ctx, hlsl_ir_resource_load(instr), state);
                 break;

+            case HLSL_IR_RESOURCE_STORE:
+                progress |= copy_propagation_transform_resource_store(ctx, hlsl_ir_resource_store(instr), state);
+                break;
+
             case HLSL_IR_STORE:
                 copy_propagation_record_store(ctx, hlsl_ir_store(instr), state);
                 break;
diff --git a/tests/uav.shader_test b/tests/uav.shader_test
index 8048af16..92ac8c4d 100644
--- a/tests/uav.shader_test
+++ b/tests/uav.shader_test
@@ -49,7 +49,7 @@ float4 main() : sv_target
 }

[test]
-todo draw quad
+draw quad
 probe uav 1 (0, 0) r (0.5)
 probe uav 1 (0, 1) r (0.6)
 probe uav 1 (1, 0) r (0.2)
@@ -99,7 +99,7 @@ float4 main() : sv_target1
 }

[test]
-todo draw quad
+draw quad
 probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)

@@ -118,7 +118,7 @@ float4 main() : sv_target1
 }

[test]
-todo draw quad
+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.