layers: Clarify Query Reset Message

spencer-lunarg · Jul 1, 2024 · 949fe72 · 949fe72
1 parent 2d13d34
commit 949fe72
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/layers/core_checks/cc_query.cpp b/layers/core_checks/cc_query.cpp
@@ -787,12 +787,13 @@ bool CoreChecks::VerifyQueryIsReset(const vvl::CommandBuffer &cb_state, const Qu
                                : unexpected_caller_vuid;
         assert(strcmp(vuid, unexpected_caller_vuid) != 0);
 
-        skip |= state_data.LogError(vuid, objlist, loc,
-                                    "%s and query %" PRIu32
-                                    ": query not reset. "
-                                    "After query pool creation, each query must be reset before it is used. "
-                                    "Queries must also be reset between uses.",
-                                    state_data.FormatHandle(query_obj.pool).c_str(), query_obj.slot);
+        skip |= state_data.LogError(
+            vuid, objlist, loc,
+            "%s and query %" PRIu32
+            ": query not reset. "
+            "After query pool creation, each query must be reset (with vkCmdResetQueryPool or vkResetQueryPool) before it is used. "
+            "Queries must also be reset between uses.",
+            state_data.FormatHandle(query_obj.pool).c_str(), query_obj.slot);
     }
 
     return skip;

diff --git a/tests/unit/query.cpp b/tests/unit/query.cpp
@@ -2536,4 +2536,24 @@ TEST_F(NegativeQuery, PerfQueryQueueFamilyIndex) {
     m_errorMonitor->VerifyFound();
     cb.end();
     vk::ReleaseProfilingLockKHR(*m_device);
+}
+
+TEST_F(NegativeQuery, NoInitReset) {
+    AddRequiredFeature(vkt::Feature::pipelineStatisticsQuery);
+    RETURN_IF_SKIP(Init());
+    InitRenderTarget();
+
+    VkQueryPoolCreateInfo qpci = vkt::QueryPool::create_info(VK_QUERY_TYPE_PIPELINE_STATISTICS, 1);
+    qpci.pipelineStatistics = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT;
+    vkt::QueryPool query_pool(*m_device, qpci);
+
+    m_commandBuffer->begin();
+    vk::CmdBeginQuery(m_commandBuffer->handle(), query_pool.handle(), 0, 0);
+    vk::CmdEndQuery(m_commandBuffer->handle(), query_pool.handle(), 0);
+    m_commandBuffer->end();
+
+    m_errorMonitor->SetDesiredError("VUID-vkCmdBeginQuery-None-00807");
+    m_default_queue->Submit(*m_commandBuffer);
+    m_default_queue->Wait();
+    m_errorMonitor->VerifyFound();
 }