From 332a36706fff1c44e72b8fce6bda3431856639d9 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 23 Sep 2015 12:31:50 -0600 Subject: bug-14715: DrawIndirect fix This patch contains fixes to structure layout for draws. These structures are accessed by HW and must be in a specific order. This change also includes reordering of the parameters for vkCmdDraw and vkCmdDrawIndexed. --- layers/param_checker.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'layers/param_checker.cpp') diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 2ffeefa6..0b6909dd 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -5688,12 +5688,12 @@ bool PostCmdDraw( VK_LAYER_EXPORT void VKAPI vkCmdDraw( VkCmdBuffer cmdBuffer, - uint32_t firstVertex, uint32_t vertexCount, - uint32_t firstInstance, - uint32_t instanceCount) + uint32_t instanceCount, + uint32_t firstVertex, + uint32_t firstInstance) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount); + get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDraw(cmdBuffer, vertexCount, instanceCount, firstVertex, firstInstance); PostCmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount); } @@ -5717,13 +5717,13 @@ bool PostCmdDrawIndexed( VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexed( VkCmdBuffer cmdBuffer, - uint32_t firstIndex, uint32_t indexCount, + uint32_t instanceCount, + uint32_t firstIndex, int32_t vertexOffset, - uint32_t firstInstance, - uint32_t instanceCount) + uint32_t firstInstance) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount); + get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDrawIndexed(cmdBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); PostCmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount); } -- cgit v1.2.3