Fixed used push constant index prefix

Luna5ama · Luna5ama · commit 2adabdaf597a · 2025-07-04T22:16:42.000-04:00
diff --git a/common/output_stream.cpp b/common/output_stream.cpp
@@ -2364,7 +2364,7 @@ void SpvReflectToYaml::Write(std::ostream& os) {
       assert(found_bv);
       auto itor = block_variable_to_index_.find(found_bv);
       assert(itor != block_variable_to_index_.end());
-      os << t4 << "- *db" << itor->second << " # " << SafeString(found_bv->name) << std::endl;
+      os << t4 << "- *bv" << itor->second << " # " << SafeString(found_bv->name) << std::endl;
     }
 
     // uint32_t                          execution_mode_count;
diff --git a/tests/glsl/buffer_handle_2.spv.yaml b/tests/glsl/buffer_handle_2.spv.yaml
@@ -838,7 +838,7 @@ module:
         - *db0 # "image0_0"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db8 # "pc"
+        - *bv8 # "pc"
       execution_mode_count: 1
       execution_modes: [7]
       local_size: [0, 0, 0]
diff --git a/tests/glsl/buffer_handle_4.spv.yaml b/tests/glsl/buffer_handle_4.spv.yaml
@@ -342,7 +342,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db5 # "params"
+        - *bv5 # "params"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/glsl/buffer_handle_5.spv.yaml b/tests/glsl/buffer_handle_5.spv.yaml
@@ -235,7 +235,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db3 # "params"
+        - *bv3 # "params"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/glsl/buffer_handle_6.spv.yaml b/tests/glsl/buffer_handle_6.spv.yaml
@@ -287,7 +287,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db4 # "g_GlobalsBDAPushConstant_0"
+        - *bv4 # "g_GlobalsBDAPushConstant_0"
       execution_mode_count: 1
       execution_modes: [7]
       local_size: [0, 0, 0]
diff --git a/tests/glsl/buffer_handle_7.spv.yaml b/tests/glsl/buffer_handle_7.spv.yaml
@@ -341,7 +341,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db4 # "params"
+        - *bv4 # "params"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/glsl/buffer_handle_uvec2_pc.spv.yaml b/tests/glsl/buffer_handle_uvec2_pc.spv.yaml
@@ -93,7 +93,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db1 # "pc"
+        - *bv1 # "pc"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/glsl/buffer_pointer.spv.yaml b/tests/glsl/buffer_pointer.spv.yaml
@@ -285,7 +285,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db4 # "push"
+        - *bv4 # "push"
       execution_mode_count: 1
       execution_modes: [7]
       local_size: [0, 0, 0]
diff --git a/tests/hlsl/pushconstant.spv.yaml b/tests/hlsl/pushconstant.spv.yaml
@@ -199,7 +199,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db3 # "g_PushConstants"
+        - *bv3 # "g_PushConstants"
       execution_mode_count: 0
       execution_modes: []
       local_size: [0, 0, 0]
diff --git a/tests/multi_entrypoint/multi_entrypoint.spv.yaml b/tests/multi_entrypoint/multi_entrypoint.spv.yaml
@@ -523,7 +523,7 @@ module:
         - *db1 # "ubo"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db4 # "push_constant_vert"
+        - *bv4 # "push_constant_vert"
       execution_mode_count: 0
       execution_modes: []
       local_size: [0, 0, 0]
@@ -552,7 +552,7 @@ module:
         - *db0 # "tex"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db6 # "push_constant_frag"
+        - *bv6 # "push_constant_frag"
       execution_mode_count: 0
       execution_modes: []
       local_size: [0, 0, 0]
diff --git a/tests/push_constants/non_zero_block_offset.spv.yaml b/tests/push_constants/non_zero_block_offset.spv.yaml
@@ -347,7 +347,7 @@ module:
       used_descriptor_bindings:
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db3 # "pc"
+        - *bv3 # "pc"
       execution_mode_count: 0
       execution_modes: []
       local_size: [0, 0, 0]
diff --git a/tests/push_constants/pointer_in_struct.spv.yaml b/tests/push_constants/pointer_in_struct.spv.yaml
@@ -257,7 +257,7 @@ module:
         - *db0 # "result"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db5 # "pc"
+        - *bv5 # "pc"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/push_constants/pointer_in_struct_2.spv.yaml b/tests/push_constants/pointer_in_struct_2.spv.yaml
@@ -361,7 +361,7 @@ module:
         - *db0 # "result"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db7 # "pc"
+        - *bv7 # "pc"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/push_constants/push_constant_basic_1.spv.yaml b/tests/push_constants/push_constant_basic_1.spv.yaml
@@ -414,7 +414,7 @@ module:
         - *db0 # ""
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db9 # ""
+        - *bv9 # ""
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/push_constants/push_constant_basic_2.spv.yaml b/tests/push_constants/push_constant_basic_2.spv.yaml
@@ -397,7 +397,7 @@ module:
         - *db0 # "result"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db9 # "pc"
+        - *bv9 # "pc"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]
diff --git a/tests/push_constants/push_constant_basic_3.spv.yaml b/tests/push_constants/push_constant_basic_3.spv.yaml
@@ -640,7 +640,7 @@ module:
         - *db0 # "result"
       used_push_constant_block_count: 1
       used_push_constant_blocks:
-        - *db14 # "pc"
+        - *bv14 # "pc"
       execution_mode_count: 1
       execution_modes: [17]
       local_size: [1, 1, 1]

Original file line number	Diff line number	Diff line change
`@@ -2364,7 +2364,7 @@ void SpvReflectToYaml::Write(std::ostream& os) {`
`2364`	`2364`	`assert(found_bv);`
`2365`	`2365`	`auto itor = block_variable_to_index_.find(found_bv);`
`2366`	`2366`	`assert(itor != block_variable_to_index_.end());`
`2367`		`- os << t4 << "- *db" << itor->second << " # " << SafeString(found_bv->name) << std::endl;`
	`2367`	`+ os << t4 << "- *bv" << itor->second << " # " << SafeString(found_bv->name) << std::endl;`
`2368`	`2368`	`}`
`2369`	`2369`
`2370`	`2370`	`// uint32_t execution_mode_count;`