diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-16 16:12:45 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-17 15:32:11 -0600 |
| commit | cf92aa46e0caf0ecf5f6ae0d5b88f55cfbc9bdc4 (patch) | |
| tree | 5202db9f2103e04cef8c30436a8881142cb07847 /include/vulkan.h | |
| parent | d69e2407bdedd40bc2ac431749676f05d381c76d (diff) | |
| download | usermoji-cf92aa46e0caf0ecf5f6ae0d5b88f55cfbc9bdc4.tar.xz | |
Bug 14644 - add poolUsage/maxSets to VkDescriptorPoolCreateInfo
Bug 14644 - vkCreateDescriptorPool should have poolUsage/maxSets as part of VkDescriptorPoolCreateInfo
merge request #342
Diffstat (limited to 'include/vulkan.h')
| -rw-r--r-- | include/vulkan.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index 25d25eec..e63841fd 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 168, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 169, 0) #if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L) @@ -1763,6 +1763,8 @@ typedef struct { typedef struct { VkStructureType sType; const void* pNext; + VkDescriptorPoolUsage poolUsage; + uint32_t maxSets; uint32_t count; const VkDescriptorTypeCount* pTypeCount; } VkDescriptorPoolCreateInfo; @@ -2175,7 +2177,7 @@ typedef VkResult (VKAPI *PFN_vkCreateSampler)(VkDevice device, const VkSamplerCr typedef void (VKAPI *PFN_vkDestroySampler)(VkDevice device, VkSampler sampler); typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout); typedef void (VKAPI *PFN_vkDestroyDescriptorSetLayout)(VkDevice device, VkDescriptorSetLayout descriptorSetLayout); -typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool); +typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool); typedef void (VKAPI *PFN_vkDestroyDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool); typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool); typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets); @@ -2651,8 +2653,6 @@ void VKAPI vkDestroyDescriptorSetLayout( VkResult VKAPI vkCreateDescriptorPool( VkDevice device, - VkDescriptorPoolUsage poolUsage, - uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool); |