Vulkan: Fix AGI hierarchy crash for noop'd clears/queries

The ASSERT in ContextVk::endEventLogForClearOrQuery() was wrong. Certain glClear*, glBeginQuery*, and glEndQuery* commands may exit early (e.g. noop). When this happens, mQueryEventType will be set to NotInQueryCmd. In such cases, return without trying to finish a non-started debug-util-marker hierarchy. Bug: b/191489405 Change-Id: If40ed00fdc6e420ae6a11c2aeaced19e5aa45a5f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2973342Reviewed-by: Trevor David Black <vantablack@google.com> Reviewed-by: Mark Lobodzinski <mark@lunarg.com> Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Ian Elliott <ianelliott@google.com>

Vulkan: Fix AGI hierarchy crash for noop'd clears/queries
3706f9eb · Ian Elliott · Angle LUCI CQ · c51c59c7 · 3706f9eb
Commit 3706f9eb authored Jun 10, 2021 by Ian Elliott Committed by Angle LUCI CQ Jun 18, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +6 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -3065,8 +3065,6 @@ void ContextVk::endEventLog(angle::EntryPoint entryPoint, PipelineType pipelineT
 }
 void ContextVk::endEventLogForClearOrQuery()
 {
-    ASSERT(mQueryEventType == GraphicsEventCmdBuf::InOutsideCmdBufQueryCmd ||
-           mQueryEventType == GraphicsEventCmdBuf::InRenderPassCmdBufQueryCmd);
    if (!mRenderer->angleDebuggerMode())
    {
        return;
@@ -3083,6 +3081,12 @@ void ContextVk::endEventLogForClearOrQuery()
            ASSERT(mRenderPassCommands);
            commandBuffer = &mRenderPassCommands->getCommandBuffer();
            break;
+        case GraphicsEventCmdBuf::NotInQueryCmd:
+            // The glClear* or gl*Query* command was noop'd or otherwise ended early.  We could
+            // call handleDirtyEventLogImpl() to start the hierarchy, but it isn't clear which (if
+            // any) command buffer to use.  We'll just skip processing this command (other than to
+            // let it stay queued for the next time handleDirtyEventLogImpl() is called.
+            return;
        default:
            UNREACHABLE();
    }