From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 7 Oct 2015 16:44:51 +0000 (-0700)
Subject: vk/0.170.2: Make vkUpdateDescriptorSets return void
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=010c6efd6510ebe319eceda73957b910024a210e;p=mesa.git

vk/0.170.2: Make vkUpdateDescriptorSets return void
---

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