Francisco Casas : vkd3d-shader/hlsl: Leave offset empty for array and struct derefs.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 315966dc2186b15e5bbe794d7d0610e4c809212e
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/315966dc2186b15e5bbe794d7d0610...

Author: Francisco Casas <fcasas(a)codeweavers.com>
Date:   Thu Feb  9 20:29:17 2023 -0300

vkd3d-shader/hlsl: Leave offset empty for array and struct derefs.

---

 libs/vkd3d-shader/hlsl_codegen.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index c6d43928..46444da5 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -125,6 +125,7 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st
 static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref,
         struct hlsl_ir_node *instr)
 {
+    const struct hlsl_type *type;
     struct hlsl_ir_node *offset;
     struct hlsl_block block;
 
@@ -134,6 +135,16 @@ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der
     /* register offsets shouldn't be used before this point is reached. */
     assert(!deref->offset.node);
 
+    type = hlsl_deref_get_type(ctx, deref);
+
+    /* Instructions that directly refer to structs or arrays (instead of single-register components)
+     * are removed later by dce. So it is not a problem to just cleanup their derefs. */
+    if (type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY)
+    {
+        hlsl_cleanup_deref(deref);
+        return;
+    }
+
     if (!(offset = new_offset_instr_from_deref(ctx, &block, deref, &instr->loc)))
         return;
     list_move_before(&instr->entry, &block.instrs);