commit d9e966aac83c28e7f6ac6535f695c9a7c06f667d
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Sep 16 16:12:45 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 17 15:32:11 2015 -0600
tree 0756260e1e37973c8d7ea50cf76bc9ffa4d1261d
parent 2adc7a32c82958f5b2f5e0ffe0b03e00e92df193

Bug 14644 - add poolUsage/maxSets to VkDescriptorPoolCreateInfo

Bug 14644 - vkCreateDescriptorPool should have poolUsage/maxSets as part of VkDescriptorPoolCreateInfo
merge request #342

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 172260e..78304fb 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1840,9 +1840,9 @@
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
+VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
 {
-    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateDescriptorPool(device, poolUsage, maxSets, pCreateInfo, pDescriptorPool);
+    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateDescriptorPool(device, pCreateInfo, pDescriptorPool);
     if (VK_SUCCESS == result) {
         // Insert this pool into Global Pool LL at head
         if (log_msg(mdd(device), VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (*pDescriptorPool).handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS",
@@ -1863,8 +1863,8 @@
                 pNewNode->createInfo.pTypeCount = new VkDescriptorTypeCount[typeCountSize];
                 memcpy((void*)pNewNode->createInfo.pTypeCount, pCreateInfo->pTypeCount, typeCountSize);
             }
-            pNewNode->poolUsage  = poolUsage;
-            pNewNode->maxSets      = maxSets;
+            pNewNode->poolUsage  = pCreateInfo->poolUsage;
+            pNewNode->maxSets      = pCreateInfo->maxSets;
             pNewNode->pool       = *pDescriptorPool;
             poolMap[pDescriptorPool->handle] = pNewNode;
         }

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 583363a..3b3cc06 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4741,6 +4741,7 @@
         return false;
     }
 
+    /* TODOVV: How do we validate maxSets? Probably belongs in the limits layer? */
 
     if(pDescriptorPool != nullptr)
     {
@@ -4758,16 +4759,14 @@
 
 VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(
     VkDevice device,
-    VkDescriptorPoolUsage poolUsage,
-    uint32_t maxSets,
     const VkDescriptorPoolCreateInfo* pCreateInfo,
     VkDescriptorPool* pDescriptorPool)
 {
     PreCreateDescriptorPool(device, pCreateInfo);
 
-    VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateDescriptorPool(device, poolUsage, maxSets, pCreateInfo, pDescriptorPool);
+    VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateDescriptorPool(device, pCreateInfo, pDescriptorPool);
 
-    PostCreateDescriptorPool(device, poolUsage, maxSets, pDescriptorPool, result);
+    PostCreateDescriptorPool(device, pCreateInfo->poolUsage, pCreateInfo->maxSets, pDescriptorPool, result);
 
     return result;
 }