[PATCH 3/4] vkd3d-shader/hlsl: Introduce hlsl_static_constant_folding() for state blocks.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl.h         |  2 ++
 libs/vkd3d-shader/hlsl.y         |  1 +
 libs/vkd3d-shader/hlsl_codegen.c | 11 +++++++++++
 3 files changed, 14 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 892ae4497..cab5331ba 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -1190,6 +1190,8 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
         enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out);
 int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out);

+void hlsl_static_constant_folding(struct hlsl_ctx *ctx, struct hlsl_block *expr);
+
 bool hlsl_init_deref_from_index_chain(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_node *chain);
 bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, const struct hlsl_deref *other);

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 944f0f5f0..87b1034e6 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -6451,6 +6451,7 @@ state:
       any_identifier '=' expr ';'
     {
         $$.lhs_name = $1;
+        hlsl_static_constant_folding(ctx, $3);
         $$.rhs_instrs = $3;
     }

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 4121fadf3..383a32f55 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -5159,3 +5159,14 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
             return VKD3D_ERROR_INVALID_ARGUMENT;
     }
 }
+
+void hlsl_static_constant_folding(struct hlsl_ctx *ctx, struct hlsl_block *expr)
+{
+    bool progress;
+
+    do
+    {
+        progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, expr, NULL);
+        progress |= hlsl_copy_propagation_execute(ctx, expr);
+    } while (progress);
+}