Francisco Casas : vkd3d-shader/hlsl: Mark vars that require non-constant dereferences.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 83c313ecc6d1f16f27edaf1e337e79d23b73fe21
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/83c313ecc6d1f16f27edaf1e337e79...

Author: Francisco Casas 
Date:   Wed Oct  4 17:28:02 2023 -0300

vkd3d-shader/hlsl: Mark vars that require non-constant dereferences.

---

libs/vkd3d-shader/hlsl.h         |  3 +++
 libs/vkd3d-shader/hlsl_codegen.c | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 38e605ba..0655bb8e 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -425,6 +425,9 @@ struct hlsl_ir_var
      * It may be less than the allocation size, e.g. for texture arrays. */
     unsigned int bind_count[HLSL_REGSET_LAST_OBJECT + 1];

+    /* Whether the shader performs dereferences with non-constant offsets in the variable. */
+    bool indexable;
+
     uint32_t is_input_semantic : 1;
     uint32_t is_output_semantic : 1;
     uint32_t is_uniform : 1;
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 4ea4f4cb..d957bd0e 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -3210,6 +3210,19 @@ static void dump_function(struct rb_entry *entry, void *context)
     rb_for_each_entry(&func->overloads, dump_function_decl, ctx);
 }

+static bool mark_indexable_vars(struct hlsl_ctx *ctx, struct hlsl_deref *deref,
+        struct hlsl_ir_node *instr)
+{
+    if (!deref->rel_offset.node)
+        return false;
+
+    assert(deref->var);
+    assert(deref->rel_offset.node->type != HLSL_IR_CONSTANT);
+    deref->var->indexable = true;
+
+    return true;
+}
+
 static char get_regset_name(enum hlsl_regset regset)
 {
     switch (regset)
@@ -4812,6 +4825,8 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
     if (TRACE_ON())
         rb_for_each_entry(&ctx->functions, dump_function, ctx);

+    transform_derefs(ctx, mark_indexable_vars, body);
+
     calculate_resource_register_counts(ctx);

allocate_register_reservations(ctx);