[PATCH 3/4] vkd3d-shader/hlsl: Remove constant deref offset srcs.

[Francisco Casas]

From: Francisco Casas

This allows to remove offset nodes from the IR, making it more readable.
---
 libs/vkd3d-shader/hlsl_codegen.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index d4b7243a..d5a4ab25 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -171,6 +171,23 @@ static bool replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der
     return true;
 }

+/* TODO: remove when no longer needed. */
+static bool clean_constant_deref_offset_srcs(struct hlsl_ctx *ctx, struct hlsl_deref *deref,
+        struct hlsl_ir_node *instr)
+{
+    if (deref->offset.node && deref->offset.node->type == HLSL_IR_CONSTANT)
+    {
+        if (deref->offset_regset == HLSL_REGSET_NUMERIC)
+            deref->offset_const += 4 * hlsl_ir_constant(deref->offset.node)->value.u[0].u;
+        else
+            deref->offset_const += hlsl_ir_constant(deref->offset.node)->value.u[0].u;
+        hlsl_src_remove(&deref->offset);
+        return true;
+    }
+    return false;
+}
+
+
 /* Split uniforms into two variables representing the constant and temp
  * registers, and copy the former to the latter, so that writes to uniforms
  * work. */
@@ -4134,6 +4151,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
     /* TODO: move forward, remove when no longer needed */
     transform_derefs(ctx, replace_deref_path_with_offset, body);
     while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL));
+    transform_derefs(ctx, clean_constant_deref_offset_srcs, body);

do
         compute_liveness(ctx, entry_func);