commit bd913ffd046955e976337ab6fb1e93520b37c375
author Yu-Jun Li <lyujun@qti.qualcomm.com> Mon Jan 07 10:48:18 2019 -0800
committer Alexander Galazin <Alexander.Galazin@arm.com> Thu Jan 24 14:34:40 2019 -0500
tree ebb8e1689580761565153a1d9e8d7bf87bbc7b9f
parent 21d43bf66ea27f768b8c5ca83c86ad6b53e531ac

Fixes multiview query tests

Queries need to be reset prior to use

Components: Vulkan
VK-GL-CTS issue: 1575

Affects:
dEQP-VK.multiview.queries.*

Change-Id: Icf0f712a3391784ee47c00de833f8417bb8337c3

external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp

diff --git a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
index 0bb6498..79d7ab0 100644
--- a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
+++ b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
@@ -2650,6 +2650,11 @@
 
 	beforeDraw();
 
+	// Query pools must be reset before use
+	m_device->cmdResetQueryPool(*m_cmdBuffer, *occlusionQueryPool, queryStartIndex, queryCountersNumber);
+	m_device->cmdResetQueryPool(*m_cmdBuffer, *timestampStartQueryPool, queryStartIndex, queryCountersNumber);
+	m_device->cmdResetQueryPool(*m_cmdBuffer, *timestampEndQueryPool, queryStartIndex, queryCountersNumber);
+
 	cmdBeginRenderPass(*m_device, *m_cmdBuffer, &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE, m_parameters.renderPassType);
 
 	m_device->cmdBindVertexBuffers(*m_cmdBuffer, 0u, DE_LENGTH_OF_ARRAY(vertexBuffers), vertexBuffers, vertexBufferOffsets);