diff options
| author | Cody Northrop <cody@lunarg.com> | 2015-04-16 13:41:56 -0600 |
|---|---|---|
| committer | Cody Northrop <cody@lunarg.com> | 2015-04-17 12:37:47 -0600 |
| commit | fb5185a983807d44bb7b1b7389c44eda7b33bcf0 (patch) | |
| tree | 65918a8c26a063d40598d3111c77b282d275f9dc /include | |
| parent | e5dfd21ca1a9ff58bde948f1c52bbbf2c674ba67 (diff) | |
| download | usermoji-fb5185a983807d44bb7b1b7389c44eda7b33bcf0.tar.xz | |
vulkan: Update vulkan.h for revision 88 -- Bug #13744
Rename some vkCmdBindDescriptorSets parameters and add a dynamic offset count.
v2: Add a check against dynamicOffsetCount before copying dset data.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index 8d495fea..b9fce560 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2148,7 +2148,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, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, const uint32_t* pUserData); +typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets); 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); @@ -2650,10 +2650,11 @@ void VKAPI vkCmdBindDynamicStateObject( void VKAPI vkCmdBindDescriptorSets( VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, - uint32_t layoutChainSlot, - uint32_t count, + uint32_t firstSet, + uint32_t setCount, const VkDescriptorSet* pDescriptorSets, - const uint32_t* pUserData); + uint32_t dynamicOffsetCount, + const uint32_t* pDynamicOffsets); void VKAPI vkCmdBindIndexBuffer( VkCmdBuffer cmdBuffer, |