diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-04-17 02:00:54 +0800 |
|---|---|---|
| committer | Tony Barbour <tony@LunarG.com> | 2015-04-16 19:35:00 -0600 |
| commit | 6521e9e251c4271db4b2012040b35e9abaa8ca80 (patch) | |
| tree | dbfec458e4e34246b7f3f34d6bda9736c20ba4e3 /include | |
| parent | 72304ef99d192d235e3244a0943cb53aae6f94fc (diff) | |
| download | usermoji-6521e9e251c4271db4b2012040b35e9abaa8ca80.tar.xz | |
vulkan: Remove VkDescriptorSetLayoutChain from vkCmdBindDescriptorSets
This is part of r30446 on vulkan.h, discussed in bug 13632.
Meaty chunks of this commit done by Olv, basic hook up and testing by Cody.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index 6a302348..d7748ce1 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2145,7 +2145,7 @@ typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCmdBuffer cmdBuffer); typedef VkResult (VKAPI *PFN_vkResetCommandBuffer)(VkCmdBuffer cmdBuffer); typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); typedef void (VKAPI *PFN_vkCmdBindDynamicStateObject)(VkCmdBuffer cmdBuffer, VkStateBindPoint stateBindPoint, VkDynamicStateObject state); -typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkDescriptorSetLayoutChain layoutChain, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, const uint32_t* pUserData); +typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, const uint32_t* pUserData); typedef void (VKAPI *PFN_vkCmdBindIndexBuffer)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType); typedef void (VKAPI *PFN_vkCmdBindVertexBuffers)(VkCmdBuffer cmdBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets); typedef void (VKAPI *PFN_vkCmdDraw)(VkCmdBuffer cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount); @@ -2640,7 +2640,6 @@ void VKAPI vkCmdBindDynamicStateObject( void VKAPI vkCmdBindDescriptorSets( VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, - VkDescriptorSetLayoutChain layoutChain, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, |