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

icd/intel/desc.c

diff --git a/icd/intel/desc.c b/icd/intel/desc.c
index 919a70d..342ef18 100644
--- a/icd/intel/desc.c
+++ b/icd/intel/desc.c
@@ -367,10 +367,8 @@
 }
 
 VkResult intel_desc_pool_create(struct intel_dev *dev,
-                                  VkDescriptorPoolUsage usage,
-                                  uint32_t max_sets,
-                                  const VkDescriptorPoolCreateInfo *info,
-                                  struct intel_desc_pool **pool_ret)
+                                const VkDescriptorPoolCreateInfo *info,
+                                struct intel_desc_pool **pool_ret)
 {
     struct intel_desc_pool *pool;
     VkResult ret;
@@ -383,7 +381,7 @@
 
     pool->dev = dev;
 
-    ret = intel_desc_region_alloc(dev->desc_region, max_sets, info,
+    ret = intel_desc_region_alloc(dev->desc_region, info->maxSets, info,
             &pool->region_begin, &pool->region_end);
     if (ret != VK_SUCCESS) {
         intel_base_destroy(&pool->obj.base);
@@ -791,15 +789,13 @@
 }
 
 ICD_EXPORT VkResult VKAPI vkCreateDescriptorPool(
-    VkDevice                                   device,
-    VkDescriptorPoolUsage                    poolUsage,
-    uint32_t                                     maxSets,
-    const VkDescriptorPoolCreateInfo*       pCreateInfo,
-    VkDescriptorPool*                         pDescriptorPool)
+    VkDevice                                    device,
+    const VkDescriptorPoolCreateInfo*           pCreateInfo,
+    VkDescriptorPool*                           pDescriptorPool)
 {
     struct intel_dev *dev = intel_dev(device);
 
-    return intel_desc_pool_create(dev, poolUsage, maxSets, pCreateInfo,
+    return intel_desc_pool_create(dev, pCreateInfo,
             (struct intel_desc_pool **) pDescriptorPool);
 }