Detect first level of BDA pointers

KhronosGroup · Jan 15, 2025 · fdd1e2f · fdd1e2f
1 parent e8f0079
commit fdd1e2f
Show file tree

Hide file tree

Showing 20 changed files with 1,504 additions and 22 deletions.
diff --git a/spirv_reflect.c b/spirv_reflect.c
@@ -2829,19 +2829,11 @@ static void MarkSelfAndAllMemberVarsAsUsed(SpvReflectBlockVariable* p_var) {
   p_var->flags &= ~SPV_REFLECT_VARIABLE_FLAGS_UNUSED;
 
   SpvOp op_type = p_var->type_description->op;
-  switch (op_type) {
-    default:
-      break;
-
-    case SpvOpTypeArray: {
-    } break;
-
-    case SpvOpTypeStruct: {
-      for (uint32_t i = 0; i < p_var->member_count; ++i) {
-        SpvReflectBlockVariable* p_member_var = &p_var->members[i];
-        MarkSelfAndAllMemberVarsAsUsed(p_member_var);
-      }
-    } break;
+  if (op_type == SpvOpTypeStruct) {
+    for (uint32_t i = 0; i < p_var->member_count; ++i) {
+      SpvReflectBlockVariable* p_member_var = &p_var->members[i];
+      MarkSelfAndAllMemberVarsAsUsed(p_member_var);
+    }
   }
 }
 
@@ -2958,7 +2950,10 @@ static SpvReflectResult ParseDescriptorBlockVariableUsage(SpvReflectPrvParser* p
         if (result != SPV_REFLECT_RESULT_SUCCESS) {
           return result;
         }
-      } else if (!is_pointer_to_pointer) {
+      } else if (is_pointer_to_pointer) {
+        // Clear UNUSED flag, but only for the pointer
+        p_member_var->flags &= ~SPV_REFLECT_VARIABLE_FLAGS_UNUSED;
+      } else {
         // Clear UNUSED flag for remaining variables
         MarkSelfAndAllMemberVarsAsUsed(p_member_var);
       }

diff --git a/spirv_reflect.h b/spirv_reflect.h
@@ -431,7 +431,7 @@ typedef struct SpvReflectInterfaceVariable {
   SpvStorageClass                     storage_class;
   const char*                         semantic;
   SpvReflectDecorationFlags           decoration_flags;
-  
+
   // The builtin id (SpvBuiltIn) if the variable is a builtin, and -1 otherwise.
   int                                 built_in;
   SpvReflectNumericTraits             numeric;

diff --git a/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml b/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml
@@ -102,7 +102,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 0
     members:
     type_description: *td0
@@ -134,7 +134,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 1
     members:
       - *bv1

diff --git a/tests/glsl/buffer_handle_1.spv.yaml b/tests/glsl/buffer_handle_1.spv.yaml
@@ -512,7 +512,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 2
     members:
       - *bv0
@@ -613,7 +613,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 2
     members:
       - *bv6

diff --git a/tests/push_constants/pointer_in_struct.spv.yaml b/tests/push_constants/pointer_in_struct.spv.yaml
@@ -169,7 +169,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 0
     members:
     type_description: *td3

diff --git a/tests/push_constants/pointer_in_struct_2.spv.yaml b/tests/push_constants/pointer_in_struct_2.spv.yaml
@@ -271,7 +271,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 2
     members:
       - *bv3

diff --git a/tests/push_constants/push_constant_basic_2.spv.yaml b/tests/push_constants/push_constant_basic_2.spv.yaml
@@ -324,7 +324,7 @@ all_block_variables:
       vector: { component_count: 0 }
       matrix: { column_count: 0, row_count: 0, stride: 0 }
     array: { dims_count: 0, dims: [], stride: 0 }
-    flags: 0x00000001 # UNUSED 
+    flags: 0x00000000 # NONE
     member_count: 0
     members:
     type_description: *td8

diff --git a/tests/test-spirv-reflect.cpp b/tests/test-spirv-reflect.cpp
@@ -906,6 +906,10 @@ const std::vector<const char*> all_spirv_paths = {
     "../tests/variable_access/copy_struct_1.spv",
     "../tests/variable_access/descriptor_indexing_0.spv",
     "../tests/variable_access/descriptor_indexing_1.spv",
+    "../tests/variable_access/phy_storage_buffer_used_0.spv",
+    "../tests/variable_access/phy_storage_buffer_used_1.spv",
+    "../tests/variable_access/phy_storage_buffer_used_2.spv",
+    "../tests/variable_access/phy_storage_buffer_used_3.spv",
     // clang-format on
 };
 }  // namespace

diff --git a/tests/variable_access/phy_storage_buffer_used_0.glsl b/tests/variable_access/phy_storage_buffer_used_0.glsl
@@ -0,0 +1,21 @@
+#version 450
+#extension GL_EXT_buffer_reference : enable
+
+layout(buffer_reference, std430) buffer Node {
+    uint payload;
+};
+
+layout(buffer_reference, std430) buffer BadNode {
+    uint bad_payload;
+};
+
+layout(set = 0, binding = 0, std430) buffer SSBO {
+    Node first_node;
+    BadNode bad_node; // used
+    uint placeholder;
+} x;
+
+void main() {
+    x.placeholder = 0;
+    x.first_node.payload = 3;
+}
diff --git a/tests/variable_access/phy_storage_buffer_used_0.spv b/tests/variable_access/phy_storage_buffer_used_0.spv