diff options
| -rw-r--r-- | include/vulkan/vulkan-0.170.2.h | 1 | ||||
| -rw-r--r-- | include/vulkan/vulkan.h | 6 | ||||
| -rw-r--r-- | src/vulkan/anv_device.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/vulkan/vulkan-0.170.2.h b/include/vulkan/vulkan-0.170.2.h index 6fdd806509c..03bcefea50a 100644 --- a/include/vulkan/vulkan-0.170.2.h +++ b/include/vulkan/vulkan-0.170.2.h @@ -1512,6 +1512,7 @@ typedef struct { VkSharingMode sharingMode; uint32_t queueFamilyCount; const uint32_t* pQueueFamilyIndices; + VkImageLayout initialLayout; } VkImageCreateInfo; typedef struct { diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 00dbf3dd69c..89963aea55c 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1837,6 +1837,8 @@ typedef struct { typedef struct { VkStructureType sType; const void* pNext; + VkDescriptorPoolUsage poolUsage; + uint32_t maxSets; uint32_t count; const VkDescriptorTypeCount* pTypeCount; } VkDescriptorPoolCreateInfo; @@ -2176,7 +2178,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); @@ -2643,8 +2645,6 @@ void VKAPI vkDestroyDescriptorSetLayout( VkResult VKAPI vkCreateDescriptorPool( VkDevice device, - VkDescriptorPoolUsage poolUsage, - uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool); diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 310a5b91131..dd0aac48303 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -1591,8 +1591,6 @@ void anv_DestroyDescriptorSetLayout( VkResult anv_CreateDescriptorPool( VkDevice device, - VkDescriptorPoolUsage poolUsage, - uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool) { |