Francisco Casas : vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 7cee81cf3e466258b72333e981c6c645d711139d
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=7cee81cf3e466258b72333e9...

Author: Francisco Casas 
Date:   Thu Apr 14 12:52:36 2022 +0200

vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().

Signed-off-by: Francisco Casas 
Signed-off-by: Giovanni Mascellani 
Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d-shader/hlsl.y | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 1eb7d2ee..bdcdc780 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1447,7 +1447,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem
     return true;
 }

-static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var,
+static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var,
         struct parse_initializer *initializer)
 {
     struct hlsl_type *type = var->data_type;
@@ -1459,13 +1459,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru
         hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
                 "Expected %u components in initializer, but got %u.",
                 hlsl_type_component_count(type), initializer_size(initializer));
-        free_parse_initializer(initializer);
         return;
     }

-    list_move_tail(list, initializer->instrs);
-    vkd3d_free(initializer->instrs);
-
     LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry)
     {
         struct hlsl_ir_node *node = initializer->args[i];
@@ -1479,19 +1475,17 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru
         {
             if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &node->loc)))
                 break;
-            list_add_tail(list, &c->node.entry);
+            list_add_tail(initializer->instrs, &c->node.entry);

if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc)))
                 break;
-            list_add_tail(list, &store->node.entry);
+            list_add_tail(initializer->instrs, &store->node.entry);
         }
         else
         {
             hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer.");
         }
     }
-
-    vkd3d_free(initializer->args);
 }

static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type,
@@ -1649,7 +1643,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t

if (type->type == HLSL_CLASS_STRUCT)
                 {
-                    struct_var_initializer(ctx, statements_list, var, &v->initializer);
+                    struct_var_initializer(ctx, var, &v->initializer);
+                    list_move_tail(statements_list, v->initializer.instrs);
+
+                    free_parse_initializer(&v->initializer);
                     vkd3d_free(v);
                     continue;
                 }