Updated test YAML

9 files changed, 569 insertions, 361 deletions

diff --git a/tests/entry_exec_mode/comp_local_size.spv.yaml b/tests/entry_exec_mode/comp_local_size.spv.yaml
new file mode 100644
index 0000000..763ef25
--- /dev/null
+++ b/tests/entry_exec_mode/comp_local_size.spv.yaml
@@ -0,0 +1,112 @@
+%YAML 1.0
+---
+all_type_descriptions:
+  - &td0
+    id: 7
+    op: 29
+    type_name: 
+    struct_member_name: "buf_Data"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x20000004 # ARRAY INT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [0,], stride: 4 }
+    member_count: 0
+    members:
+  - &td1
+    id: 8
+    op: 30
+    type_name: "buf"
+    struct_member_name: 
+    storage_class: -1 # NOT APPLICABLE
+    type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
+    decoration_flags: 0x00000002 # BUFFER_BLOCK 
+    traits:
+      numeric:
+        scalar: { width: 0, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 1
+    members:
+      - *td0
+all_block_variables:
+  - &bv0
+    name: "buf_Data"
+    offset: 0
+    absolute_offset: 0
+    size: 0
+    padded_size: 0
+    decorations: 0x00000000 # NONE
+    numeric:
+      scalar: { width: 32, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    type_description: *td0
+  - &bv1
+    name: ""
+    offset: 0
+    absolute_offset: 0
+    size: 0
+    padded_size: 0
+    decorations: 0x00000000 # NONE
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 1
+    members:
+      - *bv0
+    type_description: *td1
+all_descriptor_bindings:
+  - &db0
+    spirv_id: 10
+    name: ""
+    binding: 0
+    input_attachment_index: 0
+    set: 0
+    descriptor_type: 7 # VK_DESCRIPTOR_TYPE_STORAGE_BUFFER
+    resource_type: 8 # UAV
+    image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+    block: *bv1 # ""
+    array: { dims_count: 0, dims: [] }
+    accessed: 1
+    uav_counter_id: 4294967295
+    uav_counter_binding:
+    type_description: *td1
+    word_offset: { binding: 65, set: 61 }
+all_interface_variables:
+module:
+  generator: 8 # Khronos Glslang Reference Front End
+  entry_point_name: "main"
+  entry_point_id: 4
+  source_language: 2 # GLSL
+  source_language_version: 450
+  spirv_execution_model: 5 # GLCompute
+  shader_stage: 0x00000020 # CS
+  descriptor_binding_count: 1
+  descriptor_bindings:
+    - *db0 # ""
+  descriptor_set_count: 1
+  descriptor_sets:
+  - set: 0
+    binding_count: 1
+    bindings:
+      - *db0 # ""
+  input_variable_count: 0,
+  input_variables:
+  output_variable_count: 0,
+  output_variables:
+  push_constant_count: 0,
+  push_constants:
+...
diff --git a/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml b/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml
new file mode 100644
index 0000000..931074b
--- /dev/null
+++ b/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml
@@ -0,0 +1,393 @@
+%YAML 1.0
+---
+all_type_descriptions:
+  - &td0
+    id: 7
+    op: 23
+    type_name: 
+    struct_member_name: "gl_Position"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x00000108 # VECTOR FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 4 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+  - &td1
+    id: 6
+    op: 22
+    type_name: 
+    struct_member_name: "gl_PointSize"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x00000008 # FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+  - &td2
+    id: 10
+    op: 28
+    type_name: 
+    struct_member_name: "gl_ClipDistance"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x20000008 # ARRAY FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+  - &td3
+    id: 10
+    op: 28
+    type_name: 
+    struct_member_name: "gl_CullDistance"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x20000008 # ARRAY FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+  - &td4
+    id: 17
+    op: 28
+    type_name: "gl_PerVertex"
+    struct_member_name: 
+    storage_class: -1 # NOT APPLICABLE
+    type_flags: 0x30080000 # ARRAY STRUCT EXTERNAL_BLOCK 
+    decoration_flags: 0x00000001 # BLOCK 
+    traits:
+      numeric:
+        scalar: { width: 0, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 4
+    members:
+      - *td0
+      - *td1
+      - *td2
+      - *td3
+  - &td5
+    id: 7
+    op: 23
+    type_name: 
+    struct_member_name: "gl_Position"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x00000108 # VECTOR FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 4 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+  - &td6
+    id: 6
+    op: 22
+    type_name: 
+    struct_member_name: "gl_PointSize"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x00000008 # FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+  - &td7
+    id: 10
+    op: 28
+    type_name: 
+    struct_member_name: "gl_ClipDistance"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x20000008 # ARRAY FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+  - &td8
+    id: 10
+    op: 28
+    type_name: 
+    struct_member_name: "gl_CullDistance"
+    storage_class: 0 # UniformConstant
+    type_flags: 0x20000008 # ARRAY FLOAT 
+    decoration_flags: 0x00000000 # NONE
+    traits:
+      numeric:
+        scalar: { width: 32, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+  - &td9
+    id: 11
+    op: 30
+    type_name: "gl_PerVertex"
+    struct_member_name: 
+    storage_class: -1 # NOT APPLICABLE
+    type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
+    decoration_flags: 0x00000001 # BLOCK 
+    traits:
+      numeric:
+        scalar: { width: 0, signedness: 0 }
+        vector: { component_count: 0 }
+        matrix: { column_count: 0, row_count: 0, stride: 0 }
+      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
+      array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 4
+    members:
+      - *td5
+      - *td6
+      - *td7
+      - *td8
+all_block_variables:
+all_descriptor_bindings:
+all_interface_variables:
+  - &iv0
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000000 # NONE
+    built_in: 0 # Position
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description:
+    word_offset: { location: 0 }
+  - &iv1
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000000 # NONE
+    built_in: 0 # Position
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description:
+    word_offset: { location: 0 }
+  - &iv2
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000000 # NONE
+    built_in: 0 # Position
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description:
+    word_offset: { location: 0 }
+  - &iv3
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000000 # NONE
+    built_in: 0 # Position
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description:
+    word_offset: { location: 0 }
+  - &iv4
+    spirv_id: 19
+    name: "gl_in"
+    location: 4294967295
+    storage_class: 1 # Input
+    semantic: 
+    decoration_flags: 0x00000000 # NONE
+    built_in: -1 # ??? (-1)
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 4
+    members:
+      - *iv0 # 
+      - *iv1 # 
+      - *iv2 # 
+      - *iv3 # 
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td4
+    word_offset: { location: 0 }
+  - &iv5
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000010 # BUILT_IN 
+    built_in: 0 # Position
+    numeric:
+      scalar: { width: 32, signedness: 0 }
+      vector: { component_count: 4 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td5
+    word_offset: { location: 0 }
+  - &iv6
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000010 # BUILT_IN 
+    built_in: 1 # PointSize
+    numeric:
+      scalar: { width: 32, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td6
+    word_offset: { location: 0 }
+  - &iv7
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000010 # BUILT_IN 
+    built_in: 3 # ClipDistance
+    numeric:
+      scalar: { width: 32, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td7
+    word_offset: { location: 0 }
+  - &iv8
+    spirv_id: 0
+    name: 
+    location: 0
+    storage_class: 0 # UniformConstant
+    semantic: 
+    decoration_flags: 0x00000010 # BUILT_IN 
+    built_in: 4 # CullDistance
+    numeric:
+      scalar: { width: 32, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 1, dims: [1,], stride: 0 }
+    member_count: 0
+    members:
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td8
+    word_offset: { location: 0 }
+  - &iv9
+    spirv_id: 13
+    name: ""
+    location: 4294967295
+    storage_class: 3 # Output
+    semantic: 
+    decoration_flags: 0x00000011 # BUILT_IN BLOCK 
+    built_in: -1 # ??? (-1)
+    numeric:
+      scalar: { width: 0, signedness: 0 }
+      vector: { component_count: 0 }
+      matrix: { column_count: 0, row_count: 0, stride: 0 }
+    array: { dims_count: 0, dims: [], stride: 0 }
+    member_count: 4
+    members:
+      - *iv5 # 
+      - *iv6 # 
+      - *iv7 # 
+      - *iv8 # 
+    format: 0 # VK_FORMAT_UNDEFINED
+    type_description: *td9
+    word_offset: { location: 0 }
+module:
+  generator: 8 # Khronos Glslang Reference Front End
+  entry_point_name: "main"
+  entry_point_id: 4
+  source_language: 2 # GLSL
+  source_language_version: 450
+  spirv_execution_model: 3 # Geometry
+  shader_stage: 0x00000008 # GS
+  descriptor_binding_count: 0
+  descriptor_bindings:
+  descriptor_set_count: 0
+  descriptor_sets:
+  input_variable_count: 1,
+  input_variables:
+    - *iv4 # "gl_in"
+  output_variable_count: 1,
+  output_variables:
+    - *iv9 # ""
+  push_constant_count: 0,
+  push_constants:
+...
diff --git a/tests/glsl/runtime_array_of_array_of_struct.spv.yaml b/tests/glsl/runtime_array_of_array_of_struct.spv.yaml
index be2b17f..40014c4 100644
--- a/tests/glsl/runtime_array_of_array_of_struct.spv.yaml
+++ b/tests/glsl/runtime_array_of_array_of_struct.spv.yaml
@@ -49,7 +49,7 @@ all_type_descriptions:
         vector: { component_count: 0 }
         matrix: { column_count: 0, row_count: 0, stride: 0 }
       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [3,], stride: 8 }
+      array: { dims_count: 2, dims: [0,3,], stride: 8 }
     member_count: 2
     members:
       - *td0
@@ -120,7 +120,7 @@ all_type_descriptions:
         vector: { component_count: 0 }
         matrix: { column_count: 0, row_count: 0, stride: 0 }
       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [3,], stride: 8 }
+      array: { dims_count: 2, dims: [0,3,], stride: 8 }
     member_count: 2
     members:
       - *td4
diff --git a/tests/hlsl/append_consume.spv.yaml b/tests/hlsl/append_consume.spv.yaml
index 9c848c2..96aa8ab 100644
--- a/tests/hlsl/append_consume.spv.yaml
+++ b/tests/hlsl/append_consume.spv.yaml
@@ -32,7 +32,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 1

     members:

       - *td0

@@ -55,23 +55,6 @@ all_type_descriptions:
     members:

       - *td1

   - &td3

-    id: 2

-    op: 21

-    type_name: 

-    struct_member_name: "rgba"

-    storage_class: 0 # UniformConstant

-    type_flags: 0x00000004 # INT 

-    decoration_flags: 0x00000000 # NONE

-    traits:

-      numeric:

-        scalar: { width: 32, signedness: 0 }

-        vector: { component_count: 0 }

-        matrix: { column_count: 0, row_count: 0, stride: 0 }

-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

-    member_count: 0

-    members:

-  - &td4

     id: 8

     op: 21

     type_name: 

@@ -88,7 +71,7 @@ all_type_descriptions:
       array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-  - &td5

+  - &td4

     id: 9

     op: 30

     type_name: "type.ACSBuffer.counter"

@@ -105,8 +88,8 @@ all_type_descriptions:
       array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 1

     members:

-      - *td4

-  - &td6

+      - *td3

+  - &td5

     id: 2

     op: 21

     type_name: 

@@ -123,7 +106,7 @@ all_type_descriptions:
       array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-  - &td7

+  - &td6

     id: 4

     op: 29

     type_name: "Data"

@@ -137,11 +120,11 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 1

     members:

-      - *td6

-  - &td8

+      - *td5

+  - &td7

     id: 12

     op: 30

     type_name: "type.AppendStructuredBuffer.Data"

@@ -158,8 +141,8 @@ all_type_descriptions:
       array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 1

     members:

-      - *td7

-  - &td9

+      - *td6

+  - &td8

     id: 22

     op: 23

     type_name: 

@@ -191,7 +174,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td3

+    type_description: *td0

   - &bv1

     name: 

     offset: 0

@@ -238,7 +221,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td4

+    type_description: *td3

   - &bv4

     name: "counter.var.BufferOut"

     offset: 0

@@ -254,7 +237,7 @@ all_block_variables:
     member_count: 1

     members:

       - *bv3

-    type_description: *td5

+    type_description: *td4

   - &bv5

     name: 

     offset: 0

@@ -269,7 +252,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td4

+    type_description: *td3

   - &bv6

     name: "counter.var.BufferIn"

     offset: 0

@@ -285,7 +268,7 @@ all_block_variables:
     member_count: 1

     members:

       - *bv5

-    type_description: *td5

+    type_description: *td4

   - &bv7

     name: "rgba"

     offset: 0

@@ -300,7 +283,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td3

+    type_description: *td5

   - &bv8

     name: 

     offset: 0

@@ -316,7 +299,7 @@ all_block_variables:
     member_count: 1

     members:

       - *bv7

-    type_description: *td7

+    type_description: *td6

   - &bv9

     name: "BufferOut"

     offset: 0

@@ -332,7 +315,7 @@ all_block_variables:
     member_count: 1

     members:

       - *bv8

-    type_description: *td8

+    type_description: *td7

 all_descriptor_bindings:

   - &db0

     spirv_id: 11

@@ -348,7 +331,7 @@ all_descriptor_bindings:
     accessed: 1

     uav_counter_id: 4294967295

     uav_counter_binding:

-    type_description: *td5

+    type_description: *td4

     word_offset: { binding: 320, set: 316 }

   - &db1

     spirv_id: 7

@@ -380,7 +363,7 @@ all_descriptor_bindings:
     accessed: 1

     uav_counter_id: 4294967295

     uav_counter_binding:

-    type_description: *td5

+    type_description: *td4

     word_offset: { binding: 328, set: 324 }

   - *db0

   - &db3

@@ -397,7 +380,7 @@ all_descriptor_bindings:
     accessed: 1

     uav_counter_id: 15

     uav_counter_binding: *db2 # "counter.var.BufferOut"

-    type_description: *td8

+    type_description: *td7

     word_offset: { binding: 312, set: 308 }

 all_interface_variables:

   - &iv0

@@ -416,7 +399,7 @@ all_interface_variables:
     member_count: 0

     members:

     format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT

-    type_description: *td9

+    type_description: *td8

     word_offset: { location: 0 }

   - &iv1

     spirv_id: 30

@@ -434,7 +417,7 @@ all_interface_variables:
     member_count: 0

     members:

     format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT

-    type_description: *td9

+    type_description: *td8

     word_offset: { location: 296 }

 module:

   generator: 14 # Google spiregg

diff --git a/tests/hlsl/array_of_structured_buffer.spv.yaml b/tests/hlsl/array_of_structured_buffer.spv.yaml
index 4e90a2d..153d939 100644
--- a/tests/hlsl/array_of_structured_buffer.spv.yaml
+++ b/tests/hlsl/array_of_structured_buffer.spv.yaml
@@ -15,7 +15,7 @@ all_type_descriptions:
         vector: { component_count: 3 }
         matrix: { column_count: 0, row_count: 0, stride: 0 }
       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
+      array: { dims_count: 1, dims: [0,], stride: 12 }
     member_count: 0
     members:
   - &td1
@@ -50,7 +50,7 @@ all_type_descriptions:
         vector: { component_count: 3 }
         matrix: { column_count: 0, row_count: 0, stride: 0 }
       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
+      array: { dims_count: 1, dims: [0,], stride: 12 }
     member_count: 0
     members:
   - &td3
diff --git a/tests/hlsl/binding_types.spv.yaml b/tests/hlsl/binding_types.spv.yaml
index 86d399a..34602d4 100644
--- a/tests/hlsl/binding_types.spv.yaml
+++ b/tests/hlsl/binding_types.spv.yaml
@@ -427,7 +427,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td25

@@ -462,7 +462,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td27

@@ -532,7 +532,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td31

@@ -567,7 +567,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td33

@@ -602,7 +602,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td35

@@ -637,7 +637,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 4 }

     member_count: 0

     members:

   - &td37

diff --git a/tests/hlsl/counter_buffers.spv.yaml b/tests/hlsl/counter_buffers.spv.yaml
index 31672f7..b0949d7 100644
--- a/tests/hlsl/counter_buffers.spv.yaml
+++ b/tests/hlsl/counter_buffers.spv.yaml
@@ -84,7 +84,7 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 32 }

     member_count: 2

     members:

       - *td2

@@ -142,40 +142,6 @@ all_type_descriptions:
     member_count: 0

     members:

   - &td8

-    id: 3

-    op: 23

-    type_name: 

-    struct_member_name: "f4"

-    storage_class: 0 # UniformConstant

-    type_flags: 0x00000108 # VECTOR FLOAT 

-    decoration_flags: 0x00000000 # NONE

-    traits:

-      numeric:

-        scalar: { width: 32, signedness: 0 }

-        vector: { component_count: 4 }

-        matrix: { column_count: 0, row_count: 0, stride: 0 }

-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

-    member_count: 0

-    members:

-  - &td9

-    id: 4

-    op: 21

-    type_name: 

-    struct_member_name: "i"

-    storage_class: 0 # UniformConstant

-    type_flags: 0x00000004 # INT 

-    decoration_flags: 0x00000000 # NONE

-    traits:

-      numeric:

-        scalar: { width: 32, signedness: 1 }

-        vector: { component_count: 0 }

-        matrix: { column_count: 0, row_count: 0, stride: 0 }

-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

-    member_count: 0

-    members:

-  - &td10

     id: 6

     op: 29

     type_name: "Data"

@@ -189,12 +155,12 @@ all_type_descriptions:
         vector: { component_count: 0 }

         matrix: { column_count: 0, row_count: 0, stride: 0 }

       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown

-      array: { dims_count: 0, dims: [], stride: 0 }

+      array: { dims_count: 1, dims: [0,], stride: 32 }

     member_count: 2

     members:

-      - *td8

-      - *td9

-  - &td11

+      - *td6

+      - *td7

+  - &td9

     id: 13

     op: 30

     type_name: "type.AppendStructuredBuffer.Data"

@@ -211,8 +177,8 @@ all_type_descriptions:
       array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 1

     members:

-      - *td10

-  - &td12

+      - *td8

+  - &td10

     id: 3

     op: 23

     type_name: 

@@ -306,7 +272,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td6

+    type_description: *td2

   - &bv5

     name: "i"

     offset: 16

@@ -321,7 +287,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }

     member_count: 0

     members:

-    type_description: *td7

+    type_description: *td3

   - &bv6

     name: 

     offset: 0

@@ -401,7 +367,7 @@ all_block_variables:
     members:

       - *bv8

       - *bv9

-    type_description: *td10

+    type_description: *td8

   - &bv11

     name: "MyBufferOut"

     offset: 0

@@ -417,7 +383,7 @@ all_block_variables:
     member_count: 1

     members:

       - *bv10

-    type_description: *td11

+    type_description: *td9

 all_descriptor_bindings:

   - &db0

     spirv_id: 12

@@ -481,7 +447,7 @@ all_descriptor_bindings:
     accessed: 1

     uav_counter_id: 16

     uav_counter_binding: *db1 # "counter.var.MyBufferOut"

-    type_description: *td11

+    type_description: *td9

     word_offset: { binding: 325, set: 321 }

 all_interface_variables:

   - &iv0

@@ -500,7 +466,7 @@ all_interface_variables:
     member_count: 0

     members:

     format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT

-    type_description: *td12

+    type_description: *td10

     word_offset: { location: 0 }

   - &iv1

     spirv_id: 29

@@ -518,7 +484,7 @@ all_interface_variables:
     member_count: 0

     members:

     format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT

-    type_description: *td12

+    type_description: *td10

     word_offset: { location: 309 }

 module:

   generator: 14 # Google spiregg

diff --git a/tests/hlsl/semantics.spv.yaml b/tests/hlsl/semantics.spv.yaml
index 13391c8..e9e69bb 100644
--- a/tests/hlsl/semantics.spv.yaml
+++ b/tests/hlsl/semantics.spv.yaml
@@ -423,7 +423,7 @@ all_interface_variables:
     location: 4294967295

     storage_class: 1 # Input

     semantic: "SV_PRIMITIVEID"

-    decoration_flags: 0x00000010 # BUILT_IN 

+    decoration_flags: 0x00000050 # FLAT BUILT_IN 

     built_in: 7 # PrimitiveId

     numeric:

       scalar: { width: 32, signedness: 0 }

diff --git a/tests/hlsl/structuredbuffer.spv.yaml b/tests/hlsl/structuredbuffer.spv.yaml
index 307cda4..0523713 100644
--- a/tests/hlsl/structuredbuffer.spv.yaml
+++ b/tests/hlsl/structuredbuffer.spv.yaml
@@ -261,7 +261,7 @@ all_type_descriptions:
         vector: { component_count: 0 }
         matrix: { column_count: 0, row_count: 0, stride: 0 }
       image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
+      array: { dims_count: 1, dims: [0,], stride: 228 }
     member_count: 6
     members:
       - *td0
@@ -289,252 +289,6 @@ all_type_descriptions:
     members:
       - *td14
   - &td16
-    id: 14
-    op: 23
-    type_name: 
-    struct_member_name: "Position"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000108 # VECTOR FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 3 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td17
-    id: 13
-    op: 22
-    type_name: 
-    struct_member_name: "x"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000008 # FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td18
-    id: 13
-    op: 22
-    type_name: 
-    struct_member_name: "y"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000008 # FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td19
-    id: 13
-    op: 22
-    type_name: 
-    struct_member_name: "z"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000008 # FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td20
-    id: 3
-    op: 30
-    type_name: "SepNormal"
-    struct_member_name: "Normal"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 0, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 3
-    members:
-      - *td17
-      - *td18
-      - *td19
-  - &td21
-    id: 9
-    op: 28
-    type_name: 
-    struct_member_name: "r"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x20000008 # ARRAY FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [5,], stride: 4 }
-    member_count: 0
-    members:
-  - &td22
-    id: 9
-    op: 28
-    type_name: 
-    struct_member_name: "g"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x20000008 # ARRAY FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [5,], stride: 4 }
-    member_count: 0
-    members:
-  - &td23
-    id: 9
-    op: 28
-    type_name: 
-    struct_member_name: "b"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x20000008 # ARRAY FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [5,], stride: 4 }
-    member_count: 0
-    members:
-  - &td24
-    id: 10
-    op: 28
-    type_name: "Rgb"
-    struct_member_name: "Colors"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x30080000 # ARRAY STRUCT EXTERNAL_BLOCK 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 0, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [3,], stride: 60 }
-    member_count: 3
-    members:
-      - *td21
-      - *td22
-      - *td23
-  - &td25
-    id: 13
-    op: 22
-    type_name: 
-    struct_member_name: "u"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000008 # FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td26
-    id: 13
-    op: 22
-    type_name: 
-    struct_member_name: "v"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000008 # FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td27
-    id: 5
-    op: 30
-    type_name: "Uv"
-    struct_member_name: "TexCoords"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 0, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 2
-    members:
-      - *td25
-      - *td26
-  - &td28
-    id: 11
-    op: 28
-    type_name: 
-    struct_member_name: "Scales"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x20000008 # ARRAY FLOAT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 1, dims: [3,], stride: 4 }
-    member_count: 0
-    members:
-  - &td29
-    id: 15
-    op: 21
-    type_name: 
-    struct_member_name: "Id"
-    storage_class: 0 # UniformConstant
-    type_flags: 0x00000004 # INT 
-    decoration_flags: 0x00000000 # NONE
-    traits:
-      numeric:
-        scalar: { width: 32, signedness: 0 }
-        vector: { component_count: 0 }
-        matrix: { column_count: 0, row_count: 0, stride: 0 }
-      image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown
-      array: { dims_count: 0, dims: [], stride: 0 }
-    member_count: 0
-    members:
-  - &td30
     id: 21
     op: 23
     type_name: 
@@ -566,7 +320,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td16
+    type_description: *td0
   - &bv1
     name: "x"
     offset: 0
@@ -581,7 +335,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td17
+    type_description: *td1
   - &bv2
     name: "y"
     offset: 4
@@ -596,7 +350,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td18
+    type_description: *td2
   - &bv3
     name: "z"
     offset: 8
@@ -611,7 +365,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td19
+    type_description: *td3
   - &bv4
     name: "Normal"
     offset: 12
@@ -629,7 +383,7 @@ all_block_variables:
       - *bv1
       - *bv2
       - *bv3
-    type_description: *td20
+    type_description: *td4
   - &bv5
     name: "r"
     offset: 0
@@ -644,7 +398,7 @@ all_block_variables:
     array: { dims_count: 1, dims: [5,], stride: 4 }
     member_count: 0
     members:
-    type_description: *td21
+    type_description: *td5
   - &bv6
     name: "g"
     offset: 20
@@ -659,7 +413,7 @@ all_block_variables:
     array: { dims_count: 1, dims: [5,], stride: 4 }
     member_count: 0
     members:
-    type_description: *td22
+    type_description: *td6
   - &bv7
     name: "b"
     offset: 40
@@ -674,7 +428,7 @@ all_block_variables:
     array: { dims_count: 1, dims: [5,], stride: 4 }
     member_count: 0
     members:
-    type_description: *td23
+    type_description: *td7
   - &bv8
     name: "Colors"
     offset: 24
@@ -692,7 +446,7 @@ all_block_variables:
       - *bv5
       - *bv6
       - *bv7
-    type_description: *td24
+    type_description: *td8
   - &bv9
     name: "u"
     offset: 0
@@ -707,7 +461,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td25
+    type_description: *td9
   - &bv10
     name: "v"
     offset: 4
@@ -722,7 +476,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td26
+    type_description: *td10
   - &bv11
     name: "TexCoords"
     offset: 204
@@ -739,7 +493,7 @@ all_block_variables:
     members:
       - *bv9
       - *bv10
-    type_description: *td27
+    type_description: *td11
   - &bv12
     name: "Scales"
     offset: 212
@@ -754,7 +508,7 @@ all_block_variables:
     array: { dims_count: 1, dims: [3,], stride: 4 }
     member_count: 0
     members:
-    type_description: *td28
+    type_description: *td12
   - &bv13
     name: "Id"
     offset: 224
@@ -769,7 +523,7 @@ all_block_variables:
     array: { dims_count: 0, dims: [], stride: 0 }
     member_count: 0
     members:
-    type_description: *td29
+    type_description: *td13
   - &bv14
     name: 
     offset: 0
@@ -841,7 +595,7 @@ all_interface_variables:
     member_count: 0
     members:
     format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT
-    type_description: *td30
+    type_description: *td16
     word_offset: { location: 225 }
 module:
   generator: 14 # Google spiregg