layers: Move DescriptorSetLayoutDef to header file

KhronosGroup · Nov 11, 2024 · 26b4eff · 26b4eff
1 parent cbdfb0e
commit 26b4eff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 45 deletions.
diff --git a/layers/state_tracker/descriptor_sets.cpp b/layers/state_tracker/descriptor_sets.cpp
@@ -184,41 +184,6 @@ DescriptorSetLayoutId GetCanonicalId(const VkDescriptorSetLayoutCreateInfo *p_cr
     return descriptor_set_layout_dict.LookUp(DescriptorSetLayoutDef(p_create_info));
 }
 
-bool operator==(const DescriptorSetLayoutDef &lhs, const DescriptorSetLayoutDef &rhs) {
-    // trivial types
-    if ((lhs.GetCreateFlags() != rhs.GetCreateFlags()) || (lhs.GetBindingFlags() != rhs.GetBindingFlags())) {
-        return false;
-    }
-    // vectors of enums
-    if (lhs.GetMutableTypes() != rhs.GetMutableTypes()) {
-        return false;
-    }
-    // vectors of vku::safe_VkDescriptorSetLayoutBinding structures
-    const auto &lhs_bindings = lhs.GetBindings();
-    const auto &rhs_bindings = rhs.GetBindings();
-    if (lhs_bindings.size() != rhs_bindings.size()) {
-        return false;
-    }
-    for (size_t i = 0; i < lhs_bindings.size(); i++) {
-        const auto &l = lhs_bindings[i];
-        const auto &r = rhs_bindings[i];
-        // For things where we are comparing with the bound pipeline, the binding will always be right, but when comparing two
-        // arbitrary layouts (ex. templates, Device Generated Commands, etc) the bindings might be different
-        if (l.binding != r.binding) {
-            return false;
-        }
-        if (l.descriptorType != r.descriptorType || l.descriptorCount != r.descriptorCount || l.stageFlags != r.stageFlags) {
-            return false;
-        }
-        for (uint32_t s = 0; s < l.descriptorCount; s++) {
-            if (l.pImmutableSamplers[s] != r.pImmutableSamplers[s]) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
 std::string DescriptorSetLayoutDef::DescribeDifference(uint32_t index, const DescriptorSetLayoutDef &other) const {
     std::ostringstream ss;
     ss << "Set " << index << " ";

diff --git a/layers/state_tracker/descriptor_sets.h b/layers/state_tracker/descriptor_sets.h
@@ -247,6 +247,11 @@ class DescriptorSetLayoutDef {
 using DescriptorSetLayoutDict = hash_util::Dictionary<DescriptorSetLayoutDef, hash_util::HasHashMember<DescriptorSetLayoutDef>>;
 using DescriptorSetLayoutId = DescriptorSetLayoutDict::Id;
 
+// Compare is in header and static because hash_util KeyValueEqual need the symbol at compile time
+//
+// https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/8497
+// This just checks pointers, but two different VkSampler handles could be created with same createInfo.
+// Since this is rare enough, mark as "not the same" and check later when checking for compatibility.
 static inline bool operator==(const DescriptorSetLayoutDef &lhs, const DescriptorSetLayoutDef &rhs) {
     // trivial types
     if ((lhs.GetCreateFlags() != rhs.GetCreateFlags()) || (lhs.GetBindingFlags() != rhs.GetBindingFlags())) {
@@ -265,20 +270,17 @@ static inline bool operator==(const DescriptorSetLayoutDef &lhs, const Descripto
     for (size_t i = 0; i < lhs_bindings.size(); i++) {
         const auto &l = lhs_bindings[i];
         const auto &r = rhs_bindings[i];
-        if (l.descriptorType != r.descriptorType || l.descriptorCount != r.descriptorCount || l.stageFlags != r.stageFlags) {
+        // For things where we are comparing with the bound pipeline, the binding will always be right, but when comparing two
+        // arbitrary layouts (ex. templates, Device Generated Commands, etc) the bindings might be different
+        if (l.binding != r.binding) {
             return false;
         }
-        if (l.pImmutableSamplers != r.pImmutableSamplers) {
+        if (l.descriptorType != r.descriptorType || l.descriptorCount != r.descriptorCount || l.stageFlags != r.stageFlags) {
             return false;
         }
-        if (l.pImmutableSamplers) {
-            for (uint32_t s = 0; s < l.descriptorCount; s++) {
-                if (l.pImmutableSamplers[s] != r.pImmutableSamplers[s]) {
-                    // https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/8497
-                    // This just checks pointers, but two different VkSampler handles could be created with same createInfo.
-                    // Since this is rare enough, mark as "not the same" and check later when checking for compatibility.
-                    return false;
-                }
+        for (uint32_t s = 0; s < l.descriptorCount; s++) {
+            if (l.pImmutableSamplers[s] != r.pImmutableSamplers[s]) {
+                return false;  // only checking pointers
             }
         }
     }