Zebediah Figura : vkd3d-shader/hlsl: Store the "instrs" field of struct hlsl_attribute as a hlsl_block.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0652bb1950e90eeae576cc2c937db552c08b3374
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/0652bb1950e90eeae576cc2c937db5...

Author: Zebediah Figura 
Date:   Mon Nov 14 20:50:17 2022 -0600

vkd3d-shader/hlsl: Store the "instrs" field of struct hlsl_attribute as a hlsl_block.

---

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

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 4ed7712b..e5f66043 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -2922,7 +2922,7 @@ void hlsl_free_attribute(struct hlsl_attribute *attr)

for (i = 0; i < attr->args_count; ++i)
         hlsl_src_remove(&attr->args[i]);
-    hlsl_free_instr_list(&attr->instrs);
+    hlsl_block_cleanup(&attr->instrs);
     vkd3d_free((void *)attr->name);
     vkd3d_free(attr);
 }
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 597d3fda..e78602e8 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -337,7 +337,7 @@ struct hlsl_src
 struct hlsl_attribute
 {
     const char *name;
-    struct list instrs;
+    struct hlsl_block instrs;
     struct vkd3d_shader_location loc;
     unsigned int args_count;
     struct hlsl_src args[];
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 858d1aee..0d994673 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -5001,7 +5001,7 @@ attribute:
                 YYABORT;
             }
             $$->name = $2;
-            list_init(&$$->instrs);
+            hlsl_block_init(&$$->instrs);
             $$->loc = @$;
             $$->args_count = 0;
         }
@@ -5016,8 +5016,8 @@ attribute:
                 YYABORT;
             }
             $$->name = $2;
-            list_init(&$$->instrs);
-            list_move_tail(&$$->instrs, &$4.instrs->instrs);
+            hlsl_block_init(&$$->instrs);
+            hlsl_block_add_block(&$$->instrs, $4.instrs);
             vkd3d_free($4.instrs);
             $$->loc = @$;
             $$->args_count = $4.args_count;