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/nulldrv/nulldrv.c

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index bb67967..12015e3 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -610,8 +610,6 @@
 }
 
 static VkResult nulldrv_desc_pool_create(struct nulldrv_dev *dev,
-                                    VkDescriptorPoolUsage usage,
-                                    uint32_t max_sets,
                                     const VkDescriptorPoolCreateInfo *info,
                                     struct nulldrv_desc_pool **pool_ret)
 {
@@ -2273,16 +2271,14 @@
 }
 
 ICD_EXPORT VkResult VKAPI vkCreateDescriptorPool(
-    VkDevice                                   device,
-    VkDescriptorPoolUsage                  poolUsage,
-    uint32_t                                     maxSets,
-    const VkDescriptorPoolCreateInfo*     pCreateInfo,
-    VkDescriptorPool*                       pDescriptorPool)
+    VkDevice                                    device,
+    const VkDescriptorPoolCreateInfo*           pCreateInfo,
+    VkDescriptorPool*                           pDescriptorPool)
 {
     NULLDRV_LOG_FUNC;
     struct nulldrv_dev *dev = nulldrv_dev(device);
 
-    return nulldrv_desc_pool_create(dev, poolUsage, maxSets, pCreateInfo,
+    return nulldrv_desc_pool_create(dev, pCreateInfo,
             (struct nulldrv_desc_pool **) pDescriptorPool);
 }