OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/0.170.2: Make vkUpdateDescriptorSets return void

Browse Source
This commit is contained in:
Jason Ekstrand
2015-10-07 09:44:51 -07:00
parent 1a52bc3039
commit 010c6efd65
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/vulkan/vulkan.h
View File

@@ -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_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_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_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 VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer);
typedef void (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer); typedef void (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer);
typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass); typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass);
@@ -2643,7 +2643,7 @@ VkResult VKAPI vkFreeDescriptorSets(
uint32_t count, uint32_t count,
const VkDescriptorSet* pDescriptorSets); const VkDescriptorSet* pDescriptorSets);
VkResult VKAPI vkUpdateDescriptorSets( void VKAPI vkUpdateDescriptorSets(
VkDevice device, VkDevice device,
uint32_t writeCount, uint32_t writeCount,
const VkWriteDescriptorSet* pDescriptorWrites, const VkWriteDescriptorSet* pDescriptorWrites,

4
src/vulkan/anv_device.c
View File

@@ -1693,7 +1693,7 @@ VkResult anv_FreeDescriptorSets(
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult anv_UpdateDescriptorSets( void anv_UpdateDescriptorSets(
VkDevice device, VkDevice device,
uint32_t writeCount, uint32_t writeCount,
const VkWriteDescriptorSet* pDescriptorWrites, const VkWriteDescriptorSet* pDescriptorWrites,
@@ -1772,8 +1772,6 @@ VkResult anv_UpdateDescriptorSets(
src->descriptors[copy->srcBinding + j]; src->descriptors[copy->srcBinding + j];
} }
} }
return VK_SUCCESS;
} }
// State object functions // State object functions