diff options
| author | Jason Ekstrand <[email protected]> | 2015-10-07 09:44:51 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-07 09:44:53 -0700 |
| commit | 010c6efd6510ebe319eceda73957b910024a210e (patch) | |
| tree | 0f57a74f90f762537d7b974051899165de539519 | |
| parent | 1a52bc30390d56493ea2d0a950d8b9f01519ed24 (diff) | |
vk/0.170.2: Make vkUpdateDescriptorSets return void
| -rw-r--r-- | include/vulkan/vulkan.h | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_device.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index abf87d81e83..f453553ae5c 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -2150,7 +2150,7 @@ typedef void (VKAPI *PFN_vkDestroyDescriptorPool)(VkDevice device, VkDescriptorP 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); typedef VkResult (VKAPI *PFN_vkFreeDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets); -typedef VkResult (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies); +typedef void (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies); typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer); typedef void (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer); typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass); @@ -2643,7 +2643,7 @@ VkResult VKAPI vkFreeDescriptorSets( uint32_t count, const VkDescriptorSet* pDescriptorSets); -VkResult VKAPI vkUpdateDescriptorSets( +void VKAPI vkUpdateDescriptorSets( VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index aec900065e6..75c4c2c88d8 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -1693,7 +1693,7 @@ VkResult anv_FreeDescriptorSets( return VK_SUCCESS; } -VkResult anv_UpdateDescriptorSets( +void anv_UpdateDescriptorSets( VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, @@ -1772,8 +1772,6 @@ VkResult anv_UpdateDescriptorSets( src->descriptors[copy->srcBinding + j]; } } - - return VK_SUCCESS; } // State object functions |