Zebediah Figura : vkd3d-shader/hlsl: Introduce an hlsl_block_add_block() helper.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1da5a9a4908ec8b0707600f92f805ae67d5e7576
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1da5a9a4908ec8b0707600f92f805a...

Author: Zebediah Figura 
Date:   Thu Feb 16 18:00:01 2023 -0600

vkd3d-shader/hlsl: Introduce an hlsl_block_add_block() helper.

---

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

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index c2ee2c81..09ec2f8e 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1023,7 +1023,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl
         vkd3d_free(store);
         return NULL;
     }
-    list_move_tail(&block->instrs, &comp_path_block.instrs);
+    hlsl_block_add_block(block, &comp_path_block);
     hlsl_src_from_node(&store->rhs, rhs);

if (type_is_single_reg(rhs->data_type))
@@ -1215,7 +1215,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b
         vkd3d_free(load);
         return NULL;
     }
-    list_move_tail(&block->instrs, &comp_path_block.instrs);
+    hlsl_block_add_block(block, &comp_path_block);

hlsl_block_add_instr(block, &load->node);

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index e9134821..6c8b8da3 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -862,6 +862,11 @@ static inline void hlsl_block_add_instr(struct hlsl_block *block, struct hlsl_ir
     list_add_tail(&block->instrs, &instr->entry);
 }

+static inline void hlsl_block_add_block(struct hlsl_block *block, struct hlsl_block *add)
+{
+    list_move_tail(&block->instrs, &add->instrs);
+}
+
 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_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index be0be21e..c95ce2d8 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -114,7 +114,7 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st
                 deref->offset_regset, loc)))
             return NULL;

-        list_move_tail(&block->instrs, &idx_block.instrs);
+        hlsl_block_add_block(block, &idx_block);

type = hlsl_get_element_type_from_path_index(ctx, type, deref->path[i].node);
     }