Fix flushing of index and indirect command bufs in draw tests

Fixes #249

diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp
index 0e1f8fd..8a5cd53 100644 (file)
--- a/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp
@@ -144,8 +144,8 @@ tcu::TestStatus DrawIndexed::iterate (void)
        deMemcpy(ptr, &m_indexes[0], static_cast<size_t>(dataSize));
 
        vk::flushMappedMemoryRange(m_vk, m_context.getDevice(),
-                                                          m_vertexBuffer->getBoundMemory().getMemory(),
-                                                          m_vertexBuffer->getBoundMemory().getOffset(),
+                                                          m_indexBuffer->getBoundMemory().getMemory(),
+                                                          m_indexBuffer->getBoundMemory().getOffset(),
                                                           dataSize);
 
        const vk::VkDeviceSize vertexBufferOffset = 0;
@@ -244,8 +244,8 @@ tcu::TestStatus DrawInstancedIndexed::iterate (void)
 
        deMemcpy(ptr, &m_indexes[0], static_cast<size_t>(dataSize));
        vk::flushMappedMemoryRange(m_vk, m_context.getDevice(),
-                                                          m_vertexBuffer->getBoundMemory().getMemory(),
-                                                          m_vertexBuffer->getBoundMemory().getOffset(),
+                                                          m_indexBuffer->getBoundMemory().getMemory(),
+                                                          m_indexBuffer->getBoundMemory().getOffset(),
                                                           dataSize);
 
        const vk::VkDeviceSize vertexBufferOffset = 0;

diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp
index f048db1..394bb8a 100644 (file)
--- a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp
@@ -252,8 +252,8 @@ tcu::TestStatus IndirectDraw::iterate (void)
 
        vk::flushMappedMemoryRange(m_vk,
                                                           m_context.getDevice(),
-                                                          m_vertexBuffer->getBoundMemory().getMemory(),
-                                                          m_vertexBuffer->getBoundMemory().getOffset(),
+                                                          m_indirectBuffer->getBoundMemory().getMemory(),
+                                                          m_indirectBuffer->getBoundMemory().getOffset(),
                                                           dataSize);
 
        m_vk.cmdBindPipeline(*m_cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline);
@@ -429,8 +429,8 @@ tcu::TestStatus IndirectDrawInstanced::iterate (void)
 
        vk::flushMappedMemoryRange(m_vk,
                                                           m_context.getDevice(),
-                                                          m_vertexBuffer->getBoundMemory().getMemory(),
-                                                          m_vertexBuffer->getBoundMemory().getOffset(),
+                                                          m_indirectBuffer->getBoundMemory().getMemory(),
+                                                          m_indirectBuffer->getBoundMemory().getOffset(),
                                                           dataSize);
 
        m_vk.cmdBindPipeline(*m_cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline);