[PATCH v2 4/5] vkd3d-shader/hlsl: Use hlsl_new_expr() in add_expr().

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl.c | 10 ++++++++++
 libs/vkd3d-shader/hlsl.h | 10 ----------
 libs/vkd3d-shader/hlsl.y | 12 ++++--------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 1a92af3f..6925c2cc 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -835,6 +835,16 @@ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_va
     deref->var = var;
 }

+static void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type,
+        struct hlsl_type *data_type, struct vkd3d_shader_location loc)
+{
+    memset(node, 0, sizeof(*node));
+    node->type = type;
+    node->data_type = data_type;
+    node->loc = loc;
+    list_init(&node->uses);
+}
+
 struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs)
 {
     struct hlsl_deref lhs_deref;
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 4002ca51..787500e1 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -589,16 +589,6 @@ static inline struct hlsl_ir_swizzle *hlsl_ir_swizzle(const struct hlsl_ir_node
     return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node);
 }

-static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type,
-        struct hlsl_type *data_type, struct vkd3d_shader_location loc)
-{
-    memset(node, 0, sizeof(*node));
-    node->type = type;
-    node->data_type = data_type;
-    node->loc = loc;
-    list_init(&node->uses);
-}
-
 static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node)
 {
     src->node = node;
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 0c427005..25698fff 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1217,7 +1217,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
         enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS],
         struct hlsl_type *type, const struct vkd3d_shader_location *loc)
 {
-    struct hlsl_ir_expr *expr;
+    struct hlsl_ir_node *expr;
     unsigned int i;

if (type->type == HLSL_CLASS_MATRIX)
@@ -1271,15 +1271,11 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
         return &load->node;
     }

-    if (!(expr = hlsl_alloc(ctx, sizeof(*expr))))
+    if (!(expr = hlsl_new_expr(ctx, op, type, operands, loc)))
         return NULL;
-    init_node(&expr->node, HLSL_IR_EXPR, type, *loc);
-    expr->op = op;
-    for (i = 0; i < HLSL_MAX_OPERANDS; ++i)
-        hlsl_src_from_node(&expr->operands[i], operands[i]);
-    list_add_tail(instrs, &expr->node.entry);
+    list_add_tail(instrs, &expr->entry);

-    return &expr->node;
+    return expr;
 }

static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr)