gpuav: Create common GetDescriptorSetAndBinding

Author: spencer-lunarg

layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp

@@ -153,15 +153,7 @@ bool DescriptorClassGeneralBufferPass::RequiresInstrumentation(const Function& f
         meta.descriptor_index_id = type_manager_.GetConstantZeroUint32().Id();
     }
 
-    for (const auto& annotation : module_.annotations_) {
-        if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == variable->Id()) {
-            if (annotation->Word(2) == spv::DecorationDescriptorSet) {
-                meta.descriptor_set = annotation->Word(3);
-            } else if (annotation->Word(2) == spv::DecorationBinding) {
-                meta.descriptor_binding = annotation->Word(3);
-            }
-        }
-    }
+    GetDescriptorSetAndBinding(variable->Id(), meta.descriptor_set, meta.descriptor_binding);
 
     if (meta.descriptor_set >= glsl::kDebugInputBindlessMaxDescSets) {
         module_.InternalWarning(Name(), "Tried to use a descriptor slot over the current max limit");

layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp

@@ -142,16 +142,7 @@ bool DescriptorClassTexelBufferPass::RequiresInstrumentation(const Function& fun
         meta.descriptor_index_id = type_manager_.GetConstantZeroUint32().Id();
     }
 
-    uint32_t variable_id = meta.var_inst->ResultId();
-    for (const auto& annotation : module_.annotations_) {
-        if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == variable_id) {
-            if (annotation->Word(2) == spv::DecorationDescriptorSet) {
-                meta.descriptor_set = annotation->Word(3);
-            } else if (annotation->Word(2) == spv::DecorationBinding) {
-                meta.descriptor_binding = annotation->Word(3);
-            }
-        }
-    }
+    GetDescriptorSetAndBinding(meta.var_inst->ResultId(), meta.descriptor_set, meta.descriptor_binding);
 
     if (meta.descriptor_set >= glsl::kDebugInputBindlessMaxDescSets) {
         module_.InternalWarning(Name(), "Tried to use a descriptor slot over the current max limit");

layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp

@@ -294,15 +294,7 @@ bool DescriptorIndexingOOBPass::RequiresInstrumentation(const Function& function
 
     assert(meta.var_inst);
     uint32_t variable_id = meta.var_inst->ResultId();
-    for (const auto& annotation : module_.annotations_) {
-        if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == variable_id) {
-            if (annotation->Word(2) == spv::DecorationDescriptorSet) {
-                meta.descriptor_set = annotation->Word(3);
-            } else if (annotation->Word(2) == spv::DecorationBinding) {
-                meta.descriptor_binding = annotation->Word(3);
-            }
-        }
-    }
+    GetDescriptorSetAndBinding(variable_id, meta.descriptor_set, meta.descriptor_binding);
 
     if (meta.descriptor_set >= glsl::kDebugInputBindlessMaxDescSets) {
         module_.InternalWarning(Name(), "Tried to use a descriptor slot over the current max limit");
@@ -357,15 +349,7 @@ bool DescriptorIndexingOOBPass::RequiresInstrumentation(const Function& function
         }
 
         variable_id = meta.sampler_var_inst->ResultId();
-        for (const auto& annotation : module_.annotations_) {
-            if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == variable_id) {
-                if (annotation->Word(2) == spv::DecorationDescriptorSet) {
-                    meta.sampler_descriptor_set = annotation->Word(3);
-                } else if (annotation->Word(2) == spv::DecorationBinding) {
-                    meta.sampler_descriptor_binding = annotation->Word(3);
-                }
-            }
-        }
+        GetDescriptorSetAndBinding(variable_id, meta.sampler_descriptor_set, meta.sampler_descriptor_binding);
 
         if (meta.sampler_descriptor_set >= glsl::kDebugInputBindlessMaxDescSets) {
             module_.InternalWarning(Name(), "Sampler Tried to use a descriptor slot over the current max limit");

layers/gpuav/spirv/pass.cpp

@@ -245,6 +245,18 @@ const Instruction* Pass::GetMemberDecoration(uint32_t id, uint32_t member_index,
     return nullptr;
 }
 
+void Pass::GetDescriptorSetAndBinding(uint32_t variable_id, uint32_t& out_set, uint32_t& out_binding) const {
+    for (const auto& annotation : module_.annotations_) {
+        if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == variable_id) {
+            if (annotation->Word(2) == spv::DecorationDescriptorSet) {
+                out_set = annotation->Word(3);
+            } else if (annotation->Word(2) == spv::DecorationBinding) {
+                out_binding = annotation->Word(3);
+            }
+        }
+    }
+}
+
 // In an ideal world, this would be baked into the Type class when we construct it. The core issue is OpTypeMatrix size can be
 // different depending where it is used. Because of this, we need to have a higher level view what is going on in order to correctly
 // figure out the size of a given type.

layers/gpuav/spirv/pass.h

@@ -63,6 +63,7 @@ class Pass {
 
     const Instruction* GetDecoration(uint32_t id, spv::Decoration decoration) const;
     const Instruction* GetMemberDecoration(uint32_t id, uint32_t member_index, spv::Decoration decoration) const;
+    void GetDescriptorSetAndBinding(uint32_t variable_id, uint32_t& out_set, uint32_t& out_binding) const;
 
     uint32_t FindTypeByteSize(uint32_t type_id, uint32_t matrix_stride = 0, bool col_major = false, bool in_matrix = false) const;
     // Currently only used in the General Buffer OOB check, put here so it can be adapted for general use if needed

layers/gpuav/spirv/post_process_descriptor_indexing_pass.cpp

@@ -147,15 +147,8 @@ bool PostProcessDescriptorIndexingPass::RequiresInstrumentation(const Function&
 
     assert(var_inst);
     meta.variable_id = var_inst->ResultId();
-    for (const auto& annotation : module_.annotations_) {
-        if (annotation->Opcode() == spv::OpDecorate && annotation->Word(1) == meta.variable_id) {
-            if (annotation->Word(2) == spv::DecorationDescriptorSet) {
-                meta.descriptor_set = annotation->Word(3);
-            } else if (annotation->Word(2) == spv::DecorationBinding) {
-                meta.descriptor_binding = annotation->Word(3);
-            }
-        }
-    }
+
+    GetDescriptorSetAndBinding(meta.variable_id, meta.descriptor_set, meta.descriptor_binding);
 
     if (meta.descriptor_set >= glsl::kDebugInputBindlessMaxDescSets) {
         module_.InternalWarning(Name(), "Tried to use a descriptor slot over the current max limit");