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 /layers/draw_state.cpp | |
| 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 'layers/draw_state.cpp')
| -rw-r--r-- | layers/draw_state.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 3510370f..ab49bce8 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -1997,13 +1997,13 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindDynamicStateObject(VkCmdBuffer cmdBuffer, Vk nextTable.CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state); } -VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, const uint32_t* pUserData) +VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); if (pCB) { updateCBTracking(cmdBuffer); addCmd(pCB, CMD_BINDDESCRIPTORSETS); - for (uint32_t i=0; i<count; i++) { + for (uint32_t i=0; i<setCount; i++) { if (getSetNode(pDescriptorSets[i])) { if (dsUpdateActive(pDescriptorSets[i])) { // TODO : This check here needs to be made at QueueSubmit time @@ -2034,7 +2034,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipe sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer); layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str); } - nextTable.CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layoutChainSlot, count, pDescriptorSets, pUserData); + nextTable.CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); } VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) |