Francisco Casas : vkd3d-shader/hlsl: Always load from a synthetic copy in add_load_component().

[Alexandre Julliard]

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

Author: Francisco Casas 
Date:   Thu Mar  9 20:29:03 2023 -0300

vkd3d-shader/hlsl: Always load from a synthetic copy in add_load_component().

---

libs/vkd3d-shader/hlsl.y                  | 24 ++++++++----------------
 tests/hlsl-function.shader_test           |  4 ++--
 tests/hlsl-intrinsic-override.shader_test |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 48a00540..275587e2 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -624,27 +624,19 @@ static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list
         unsigned int comp, const struct vkd3d_shader_location *loc)
 {
     const struct hlsl_deref *src;
+    struct hlsl_ir_store *store;
     struct hlsl_ir_load *load;
     struct hlsl_block block;
+    struct hlsl_ir_var *var;

-    if (var_instr->type == HLSL_IR_LOAD)
-    {
-        src = &hlsl_ir_load(var_instr)->src;
-    }
-    else
-    {
-        struct hlsl_ir_store *store;
-        struct hlsl_ir_var *var;
-
-        if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc)))
-            return NULL;
+    if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc)))
+        return NULL;

-        if (!(store = hlsl_new_simple_store(ctx, var, var_instr)))
-            return NULL;
-        list_add_tail(instrs, &store->node.entry);
+    if (!(store = hlsl_new_simple_store(ctx, var, var_instr)))
+        return NULL;
+    list_add_tail(instrs, &store->node.entry);

-        src = &store->lhs;
-    }
+    src = &store->lhs;

if (!(load = hlsl_new_load_component(ctx, &block, src, comp, loc)))
         return NULL;
diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test
index a7cad6d7..4d4c2e2b 100644
--- a/tests/hlsl-function.shader_test
+++ b/tests/hlsl-function.shader_test
@@ -276,7 +276,7 @@ float4 main() : sv_target

[test]
 draw quad
-todo probe all rgba (2.0, 3.0, 6.0, 7.0)
+probe all rgba (2.0, 3.0, 6.0, 7.0)

[pixel shader]
@@ -294,4 +294,4 @@ float4 main() : sv_target

[test]
 draw quad
-todo probe all rgba (2.0, 3.0, 6.0, 7.0)
+probe all rgba (2.0, 3.0, 6.0, 7.0)
diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test
index 13e1752d..55a23f21 100644
--- a/tests/hlsl-intrinsic-override.shader_test
+++ b/tests/hlsl-intrinsic-override.shader_test
@@ -12,7 +12,7 @@ float4 main() : sv_target

[test]
 draw quad
-todo probe all rgba (0.3, 0.3, 0.4, 0.6)
+probe all rgba (0.3, 0.3, 0.4, 0.6)

[pixel shader]