commit 88a1a6694ef9a22134463d9327096e1e350bd531
author Mark Lobodzinski <mark@lunarg.com> Mon Jul 02 14:09:39 2018 -0600
committer Mark Lobodzinski <mark@lunarg.com> Mon Jul 02 15:52:41 2018 -0600
tree f00da58c7ae476889b922255a70548a39133d197
parent 5a1c8d24e795b63a70fbb1d794f710afff5b7364

layers: Refactor GetDescSetLayoutSupport OT calls

layers/object_tracker_utils.cpp

diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp
index 4cfb935..63d968c 100644
--- a/layers/object_tracker_utils.cpp
+++ b/layers/object_tracker_utils.cpp
@@ -913,6 +913,22 @@
     return result;
 }
 
+static inline bool ValidateSamplerObjects(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo) {
+    bool skip = false;
+    if (pCreateInfo->pBindings) {
+        for (uint32_t index1 = 0; index1 < pCreateInfo->bindingCount; ++index1) {
+            for (uint32_t index2 = 0; index2 < pCreateInfo->pBindings[index1].descriptorCount; ++index2) {
+                if (pCreateInfo->pBindings[index1].pImmutableSamplers) {
+                    skip |=
+                        ValidateObject(device, pCreateInfo->pBindings[index1].pImmutableSamplers[index2], kVulkanObjectTypeSampler,
+                                       true, "VUID-VkDescriptorSetLayoutBinding-descriptorType-00282", kVUIDUndefined);
+                }
+            }
+        }
+    }
+    return skip;
+}
+
 VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutSupport(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
                                                          VkDescriptorSetLayoutSupport *pSupport) {
     bool skip = false;
@@ -921,17 +937,7 @@
         skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false,
                                "VUID-vkGetDescriptorSetLayoutSupport-device-parameter", kVUIDUndefined);
         if (pCreateInfo) {
-            if (pCreateInfo->pBindings) {
-                for (uint32_t index1 = 0; index1 < pCreateInfo->bindingCount; ++index1) {
-                    for (uint32_t index2 = 0; index2 < pCreateInfo->pBindings[index1].descriptorCount; ++index2) {
-                        if (pCreateInfo->pBindings[index1].pImmutableSamplers) {
-                            skip |= ValidateObject(device, pCreateInfo->pBindings[index1].pImmutableSamplers[index2],
-                                                   kVulkanObjectTypeSampler, true,
-                                                   "VUID-VkDescriptorSetLayoutBinding-descriptorType-00282", kVUIDUndefined);
-                        }
-                    }
-                }
-            }
+            skip |= ValidateSamplerObjects(device, pCreateInfo);
         }
     }
     if (skip) return;
@@ -947,17 +953,7 @@
         skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false,
                                "VUID-vkGetDescriptorSetLayoutSupportKHR-device-parameter", kVUIDUndefined);
         if (pCreateInfo) {
-            if (pCreateInfo->pBindings) {
-                for (uint32_t index1 = 0; index1 < pCreateInfo->bindingCount; ++index1) {
-                    for (uint32_t index2 = 0; index2 < pCreateInfo->pBindings[index1].descriptorCount; ++index2) {
-                        if (pCreateInfo->pBindings[index1].pImmutableSamplers) {
-                            skip |= ValidateObject(device, pCreateInfo->pBindings[index1].pImmutableSamplers[index2],
-                                                   kVulkanObjectTypeSampler, true,
-                                                   "VUID-VkDescriptorSetLayoutBinding-descriptorType-00282", kVUIDUndefined);
-                        }
-                    }
-                }
-            }
+            skip |= ValidateSamplerObjects(device, pCreateInfo);
         }
     }
     if (skip) return;