aboutsummaryrefslogtreecommitdiff
path: root/layers/draw_state.cpp
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-04-16 13:38:46 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-04-16 14:26:00 -0600
commit6b0caf1faf85cd610b63fae31e3eb89833c94276 (patch)
tree672f4335e49f57529955dfd555cc7c423a19c798 /layers/draw_state.cpp
parent86e7a8175f04e074c596ff78e69798fe9b7693c4 (diff)
downloadusermoji-6b0caf1faf85cd610b63fae31e3eb89833c94276.tar.xz
bug 13632: Convert commands to plural form
part of multiple commits to implement bug #13632. bug 13632 header version 82 svn version: 30446 This patch converts: vkCmdBindVertexBuffer -> vkCmdBindVertexBuffers vkQueueAddMemReference -> vkQueueAddMemReferences vkQueueRemoveMemReference -> vkQueueRemoveMemReferences
Diffstat (limited to 'layers/draw_state.cpp')
-rw-r--r--layers/draw_state.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 5dbf9626..01e4e558 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2053,21 +2053,26 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer
nextTable.CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType);
}
-VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffer(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkGpuSize offset, uint32_t binding)
+VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers(
+ VkCmdBuffer cmdBuffer,
+ uint32_t startBinding,
+ uint32_t bindingCount,
+ const VkBuffer* pBuffers,
+ const VkGpuSize* pOffsets)
{
GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
if (pCB) {
+ /* TODO: Need to track all the vertex buffers, not just last one */
updateCBTracking(cmdBuffer);
addCmd(pCB, CMD_BINDVERTEXBUFFER);
- pCB->lastVtxBinding = binding;
+ pCB->lastVtxBinding = startBinding + bindingCount -1;
validateVBBinding(cmdBuffer);
- }
- else {
+ } else {
char str[1024];
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.CmdBindVertexBuffer(cmdBuffer, buffer, offset, binding);
+ nextTable.CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets);
}
VK_LAYER_EXPORT void VKAPI vkCmdDraw(VkCmdBuffer cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
@@ -2792,8 +2797,8 @@ VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* funcNam
return (void*) vkCmdBindDynamicStateObject;
if (!strcmp(funcName, "vkCmdBindDescriptorSets"))
return (void*) vkCmdBindDescriptorSets;
- if (!strcmp(funcName, "vkCmdBindVertexBuffer"))
- return (void*) vkCmdBindVertexBuffer;
+ if (!strcmp(funcName, "vkCmdBindVertexBuffers"))
+ return (void*) vkCmdBindVertexBuffers;
if (!strcmp(funcName, "vkCmdBindIndexBuffer"))
return (void*) vkCmdBindIndexBuffer;
if (!strcmp(funcName, "vkCmdDraw"))