[PATCH v2 0/5] MR169: hlsl: Return hlsl_ir_node pointers from instruction constructors, part 2.

[Zebediah Figura (＠zfigura)]

--
  v2: vkd3d-shader/hlsl: Remove an unused local variable from create_loop().
      vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_load_component().
      vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from add_load_component().
      vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_jump().
      vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_int_constant().

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/169

[PATCH v2 1/5] vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_int_constant().

[Zebediah Figura]

From: Zebediah Figura

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

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 2de53613..cb2639ce 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1149,8 +1149,7 @@ struct hlsl_ir_node *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f,
     return &c->node;
 }

-struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n,
-        const struct vkd3d_shader_location *loc)
+struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc)
 {
     struct hlsl_ir_constant *c;

@@ -1159,7 +1158,7 @@ struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n,
     if (c)
         c->value[0].i = n;

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

struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n,
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index ce20a12c..11c46645 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -1069,8 +1069,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx,
         const struct hlsl_semantic *semantic, const struct vkd3d_shader_location *loc);
 struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition,
         struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc);
-struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n,
-        const struct vkd3d_shader_location *loc);
+struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc);
 struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type,
         const struct vkd3d_shader_location *loc);

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index b8b57d27..cce2437b 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1839,7 +1839,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem
         const struct vkd3d_shader_location *loc)
 {
     struct hlsl_ir_node *lhs = node_from_list(instrs);
-    struct hlsl_ir_constant *one;
+    struct hlsl_ir_node *one;

if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST)
         hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST,
@@ -1847,9 +1847,9 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem

if (!(one = hlsl_new_int_constant(ctx, 1, loc)))
         return false;
-    list_add_tail(instrs, &one->node.entry);
+    list_add_tail(instrs, &one->entry);

-    if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node))
+    if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, one))
         return false;

if (post)
@@ -5389,11 +5389,11 @@ primary_expr:
         }
     | C_INTEGER
         {
-            struct hlsl_ir_constant *c;
+            struct hlsl_ir_node *c;

if (!(c = hlsl_new_int_constant(ctx, $1, &@1)))
                 YYABORT;
-            if (!($$ = make_list(ctx, &c->node)))
+            if (!($$ = make_list(ctx, c)))
                 YYABORT;
         }
     | boolean

[PATCH v2 2/5] vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_jump().

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl.c         | 10 +++-------
 libs/vkd3d-shader/hlsl.h         |  4 ++--
 libs/vkd3d-shader/hlsl.y         | 21 ++++++++++-----------
 libs/vkd3d-shader/hlsl_codegen.c |  5 ++---
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index cb2639ce..04630db7 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1384,7 +1384,7 @@ struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *v
     return &index->node;
 }

-struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type,
+struct hlsl_ir_node *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type,
         const struct vkd3d_shader_location *loc)
 {
     struct hlsl_ir_jump *jump;
@@ -1393,7 +1393,7 @@ struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type
         return NULL;
     init_node(&jump->node, HLSL_IR_JUMP, NULL, loc);
     jump->type = type;
-    return jump;
+    return &jump->node;
 }

struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, const struct vkd3d_shader_location *loc)
@@ -1543,11 +1543,7 @@ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_ma

static struct hlsl_ir_node *clone_jump(struct hlsl_ctx *ctx, struct hlsl_ir_jump *src)
 {
-    struct hlsl_ir_jump *dst;
-
-    if (!(dst = hlsl_new_jump(ctx, src->type, &src->node.loc)))
-        return NULL;
-    return &dst->node;
+    return hlsl_new_jump(ctx, src->type, &src->node.loc);
 }

static struct hlsl_ir_node *clone_load(struct hlsl_ctx *ctx, struct clone_instr_map *map, struct hlsl_ir_load *src)
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 11c46645..a06674e2 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -1070,8 +1070,8 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx,
 struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition,
         struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc);
 struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc);
-struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type,
-        const struct vkd3d_shader_location *loc);
+struct hlsl_ir_node *hlsl_new_jump(struct hlsl_ctx *ctx,
+        enum hlsl_ir_jump_type type, const struct vkd3d_shader_location *loc);

void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_var *var);

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index cce2437b..dd70c730 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -407,9 +407,8 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod,

static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list)
 {
-    struct hlsl_ir_node *condition, *not, *iff;
+    struct hlsl_ir_node *condition, *not, *iff, *jump;
     struct hlsl_block then_block;
-    struct hlsl_ir_jump *jump;

/* E.g. "for (i = 0; ; ++i)". */
     if (list_empty(cond_list))
@@ -424,7 +423,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis

if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_BREAK, &condition->loc)))
         return false;
-    hlsl_block_add_instr(&then_block, &jump->node);
+    hlsl_block_add_instr(&then_block, jump);

if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc)))
         return false;
@@ -585,11 +584,11 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ctx *ctx, struct hlsl_ir_
     return NULL;
 }

-static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs,
+static bool add_return(struct hlsl_ctx *ctx, struct list *instrs,
         struct hlsl_ir_node *return_value, const struct vkd3d_shader_location *loc)
 {
     struct hlsl_type *return_type = ctx->cur_function->return_type;
-    struct hlsl_ir_jump *jump;
+    struct hlsl_ir_node *jump;

if (ctx->cur_function->return_var)
     {
@@ -598,16 +597,16 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs
             struct hlsl_ir_store *store;

if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, loc)))
-                return NULL;
+                return false;

if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value)))
-                return NULL;
+                return false;
             list_add_after(&return_value->entry, &store->node.entry);
         }
         else
         {
             hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void functions must return a value.");
-            return NULL;
+            return false;
         }
     }
     else
@@ -617,10 +616,10 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs
     }

if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, loc)))
-        return NULL;
-    list_add_tail(instrs, &jump->node.entry);
+        return false;
+    list_add_tail(instrs, &jump->entry);

-    return jump;
+    return true;
 }

static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr,
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index d09d47f8..42f8ab3b 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -516,10 +516,9 @@ static bool find_recursive_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst
 static void insert_early_return_break(struct hlsl_ctx *ctx,
         struct hlsl_ir_function_decl *func, struct hlsl_ir_node *cf_instr)
 {
+    struct hlsl_ir_node *iff, *jump;
     struct hlsl_block then_block;
-    struct hlsl_ir_jump *jump;
     struct hlsl_ir_load *load;
-    struct hlsl_ir_node *iff;

hlsl_block_init(&then_block);

@@ -529,7 +528,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx,

if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_BREAK, &cf_instr->loc)))
         return;
-    hlsl_block_add_instr(&then_block, &jump->node);
+    hlsl_block_add_instr(&then_block, jump);

if (!(iff = hlsl_new_if(ctx, &load->node, &then_block, NULL, &cf_instr->loc)))
         return;

[PATCH v2 3/5] vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from add_load_component().

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl.y | 56 +++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index dd70c730..86f0f565 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -273,7 +273,7 @@ static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_typ
     return hlsl_types_are_componentwise_equal(ctx, src, dst);
 }

-static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr,
+static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr,
         unsigned int comp, const struct vkd3d_shader_location *loc);

static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs,
@@ -311,6 +311,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs,

for (dst_idx = 0; dst_idx < dst_comp_count; ++dst_idx)
         {
+            struct hlsl_ir_node *component_load;
             struct hlsl_type *dst_comp_type;
             struct hlsl_ir_store *store;
             struct hlsl_block block;
@@ -333,10 +334,10 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs,

dst_comp_type = hlsl_type_get_component_type(ctx, dst_type, dst_idx);

-            if (!(load = add_load_component(ctx, instrs, node, src_idx, loc)))
+            if (!(component_load = add_load_component(ctx, instrs, node, src_idx, loc)))
                 return NULL;

-            if (!(cast = hlsl_new_cast(ctx, &load->node, dst_comp_type, loc)))
+            if (!(cast = hlsl_new_cast(ctx, component_load, dst_comp_type, loc)))
                 return NULL;
             list_add_tail(instrs, &cast->entry);

@@ -622,7 +623,7 @@ static bool add_return(struct hlsl_ctx *ctx, struct list *instrs,
     return true;
 }

-static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr,
+static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr,
         unsigned int comp, const struct vkd3d_shader_location *loc)
 {
     const struct hlsl_deref *src;
@@ -644,7 +645,7 @@ static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list
         return NULL;
     list_move_tail(instrs, &block.instrs);

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

static bool add_record_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record,
@@ -1283,8 +1284,9 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
     if (type->class == HLSL_CLASS_MATRIX)
     {
         struct hlsl_type *scalar_type;
+        struct hlsl_ir_load *var_load;
         struct hlsl_deref var_deref;
-        struct hlsl_ir_load *load;
+        struct hlsl_ir_node *load;
         struct hlsl_ir_var *var;

scalar_type = hlsl_get_scalar_type(ctx, type->base_type);
@@ -1307,7 +1309,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
                     if (!(load = add_load_component(ctx, instrs, operands[j], i, loc)))
                         return NULL;

-                    cell_operands[j] = &load->node;
+                    cell_operands[j] = load;
                 }
             }

@@ -1319,11 +1321,11 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
             list_move_tail(instrs, &block.instrs);
         }

-        if (!(load = hlsl_new_var_load(ctx, var, loc)))
+        if (!(var_load = hlsl_new_var_load(ctx, var, loc)))
             return NULL;
-        list_add_tail(instrs, &load->node.entry);
+        list_add_tail(instrs, &var_load->node.entry);

-        return &load->node;
+        return &var_load->node;
     }

if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc)))
@@ -1776,10 +1778,9 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in

for (i = 0; i < mat->data_type->dimx; ++i)
         {
+            struct hlsl_ir_node *cell, *load;
             struct hlsl_ir_store *store;
             struct hlsl_ir_constant *c;
-            struct hlsl_ir_node *cell;
-            struct hlsl_ir_load *load;
             struct hlsl_deref deref;

if (!(writemask & (1 << i)))
@@ -1799,7 +1800,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in
             if (!hlsl_init_deref_from_index_chain(ctx, &deref, cell))
                 return NULL;

-            if (!(store = hlsl_new_store_index(ctx, &deref, NULL, &load->node, 0, &rhs->loc)))
+            if (!(store = hlsl_new_store_index(ctx, &deref, NULL, load, 0, &rhs->loc)))
             {
                 hlsl_cleanup_deref(&deref);
                 return NULL;
@@ -1878,10 +1879,9 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct list *instrs,

for (k = 0; k < src_comp_count; ++k)
     {
+        struct hlsl_ir_node *conv, *load;
         struct hlsl_type *dst_comp_type;
         struct hlsl_ir_store *store;
-        struct hlsl_ir_load *load;
-        struct hlsl_ir_node *conv;
         struct hlsl_block block;

if (!(load = add_load_component(ctx, instrs, src, k, &src->loc)))
@@ -1889,7 +1889,7 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct list *instrs,

dst_comp_type = hlsl_type_get_component_type(ctx, dst->data_type, *store_index);

-        if (!(conv = add_implicit_conversion(ctx, instrs, &load->node, dst_comp_type, &src->loc)))
+        if (!(conv = add_implicit_conversion(ctx, instrs, load, dst_comp_type, &src->loc)))
             return;

if (!(store = hlsl_new_store_component(ctx, &block, &dst_deref, *store_index, conv)))
@@ -2407,8 +2407,7 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx,
 static bool intrinsic_all(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
-    struct hlsl_ir_node *arg = params->args[0], *mul, *one, *zero;
-    struct hlsl_ir_load *load;
+    struct hlsl_ir_node *arg = params->args[0], *mul, *one, *zero, *load;
     unsigned int i, count;

if (!(one = hlsl_new_float_constant(ctx, 1.0f, loc)))
@@ -2427,7 +2426,7 @@ static bool intrinsic_all(struct hlsl_ctx *ctx,
         if (!(load = add_load_component(ctx, params->instrs, arg, i, loc)))
             return false;

-        if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &load->node, mul, loc)))
+        if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, load, mul, loc)))
             return false;
     }

@@ -2437,8 +2436,7 @@ static bool intrinsic_all(struct hlsl_ctx *ctx,
 static bool intrinsic_any(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
-    struct hlsl_ir_node *arg = params->args[0], *dot, *or, *zero, *bfalse;
-    struct hlsl_ir_load *load;
+    struct hlsl_ir_node *arg = params->args[0], *dot, *or, *zero, *bfalse, *load;
     unsigned int i, count;

if (arg->data_type->class != HLSL_CLASS_VECTOR && arg->data_type->class != HLSL_CLASS_SCALAR)
@@ -2472,7 +2470,7 @@ static bool intrinsic_any(struct hlsl_ctx *ctx,
             if (!(load = add_load_component(ctx, params->instrs, arg, i, loc)))
                 return false;

-            if (!(or = add_binary_bitwise_expr(ctx, params->instrs, HLSL_OP2_BIT_OR, or, &load->node, loc)))
+            if (!(or = add_binary_bitwise_expr(ctx, params->instrs, HLSL_OP2_BIT_OR, or, load, loc)))
                 return false;
         }

@@ -2974,8 +2972,7 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx,

for (k = 0; k < cast_type1->dimx && k < cast_type2->dimy; ++k)
             {
-                struct hlsl_ir_load *value1, *value2;
-                struct hlsl_ir_node *mul;
+                struct hlsl_ir_node *value1, *value2, *mul;

if (!(value1 = add_load_component(ctx, params->instrs, cast1, j * cast1->data_type->dimx + k, loc)))
                     return false;
@@ -2983,7 +2980,7 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx,
                 if (!(value2 = add_load_component(ctx, params->instrs, cast2, k * cast2->data_type->dimx + i, loc)))
                     return false;

-                if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &value1->node, &value2->node, loc)))
+                if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, value1, value2, loc)))
                     return false;

if (instr)
@@ -3266,9 +3263,10 @@ static bool intrinsic_transpose(struct hlsl_ctx *ctx,
 {
     struct hlsl_ir_node *arg = params->args[0];
     struct hlsl_type *arg_type = arg->data_type;
+    struct hlsl_ir_load *var_load;
     struct hlsl_deref var_deref;
     struct hlsl_type *mat_type;
-    struct hlsl_ir_load *load;
+    struct hlsl_ir_node *load;
     struct hlsl_ir_var *var;
     unsigned int i, j;

@@ -3306,15 +3304,15 @@ static bool intrinsic_transpose(struct hlsl_ctx *ctx,
             if (!(load = add_load_component(ctx, params->instrs, arg, j * arg->data_type->dimx + i, loc)))
                 return false;

-            if (!(store = hlsl_new_store_component(ctx, &block, &var_deref, i * var->data_type->dimx + j, &load->node)))
+            if (!(store = hlsl_new_store_component(ctx, &block, &var_deref, i * var->data_type->dimx + j, load)))
                 return false;
             list_move_tail(params->instrs, &block.instrs);
         }
     }

-    if (!(load = hlsl_new_var_load(ctx, var, loc)))
+    if (!(var_load = hlsl_new_var_load(ctx, var, loc)))
         return false;
-    list_add_tail(params->instrs, &load->node.entry);
+    list_add_tail(params->instrs, &var_load->node.entry);

return true;
 }

[PATCH v2 4/5] vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_load_component().

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl.c | 4 ++--
 libs/vkd3d-shader/hlsl.h | 2 +-
 libs/vkd3d-shader/hlsl.y | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 04630db7..32511590 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1263,7 +1263,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var
     return hlsl_new_load_index(ctx, &var_deref, NULL, loc);
 }

-struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block,
+struct hlsl_ir_node *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block,
         const struct hlsl_deref *deref, unsigned int comp, const struct vkd3d_shader_location *loc)
 {
     struct hlsl_type *type, *comp_type;
@@ -1288,7 +1288,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b

hlsl_block_add_instr(block, &load->node);

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

struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx,
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index a06674e2..7de5e2eb 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -1079,7 +1079,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var
         const struct vkd3d_shader_location *loc);
 struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
         struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc);
-struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block,
+struct hlsl_ir_node *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block,
         const struct hlsl_deref *deref, unsigned int comp, const struct vkd3d_shader_location *loc);

struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs);
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 86f0f565..2a8e3160 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -628,7 +628,7 @@ static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list
 {
     const struct hlsl_deref *src;
     struct hlsl_ir_store *store;
-    struct hlsl_ir_load *load;
+    struct hlsl_ir_node *load;
     struct hlsl_block block;
     struct hlsl_ir_var *var;

@@ -645,7 +645,7 @@ static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list
         return NULL;
     list_move_tail(instrs, &block.instrs);

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

static bool add_record_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record,

[PATCH v2 5/5] vkd3d-shader/hlsl: Remove an unused local variable from create_loop().

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl.y | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 2a8e3160..b9e03325 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -444,7 +444,6 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, struc
 {
     struct list *list = NULL;
     struct hlsl_ir_loop *loop = NULL;
-    struct hlsl_ir_if *cond_jump = NULL;

if (!(list = make_empty_list(ctx)))
         goto oom;
@@ -477,7 +476,6 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, struc

oom:
     vkd3d_free(loop);
-    vkd3d_free(cond_jump);
     vkd3d_free(list);
     destroy_instr_list(init);
     destroy_instr_list(cond);

[PATCH v2 0/5] MR169: hlsl: Return hlsl_ir_node pointers from instruction constructors, part 2. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.