Vulkan: Submit Dispatch commands outside renderpass

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -3020,15 +3020,24 @@ void ContextVk::logEvent(const char *eventString)
     mComputeDirtyBits.set(DIRTY_BIT_EVENT_LOG);
 }
 
-void ContextVk::endEventLog(angle::EntryPoint entryPoint)
+void ContextVk::endEventLog(angle::EntryPoint entryPoint, PipelineType pipelineType)
 {
     if (!mRenderer->angleDebuggerMode())
     {
         return;
     }
 
-    ASSERT(mRenderPassCommands);
-    mRenderPassCommands->getCommandBuffer().endDebugUtilsLabelEXT();
+    if (pipelineType == PipelineType::Graphics)
+    {
+        ASSERT(mRenderPassCommands);
+        mRenderPassCommands->getCommandBuffer().endDebugUtilsLabelEXT();
+    }
+    else
+    {
+        ASSERT(pipelineType == PipelineType::Compute);
+        ASSERT(mOutsideRenderPassCommands);
+        mOutsideRenderPassCommands->getCommandBuffer().endDebugUtilsLabelEXT();
+    }
 }
 
 angle::Result ContextVk::handleNoopDrawEvent()

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -208,7 +208,7 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
 
     // Record GL API calls for debuggers
     void logEvent(const char *eventString);
-    void endEventLog(angle::EntryPoint entryPoint);
+    void endEventLog(angle::EntryPoint entryPoint, PipelineType pipelineType);
 
     bool isViewportFlipEnabledForDrawFBO() const;
     bool isViewportFlipEnabledForReadFBO() const;

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp

@@ -37,10 +37,17 @@ void DebugAnnotatorVk::endEvent(gl::Context *context,
                                 angle::EntryPoint entryPoint)
 {
     angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
-    if (vkCmdBeginDebugUtilsLabelEXT && context && isDrawOrDispatchEntryPoint(entryPoint))
+    if (vkCmdBeginDebugUtilsLabelEXT && context)
     {
         ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
-        contextVk->endEventLog(entryPoint);
+        if (isDrawEntryPoint(entryPoint))
+        {
+            contextVk->endEventLog(entryPoint, PipelineType::Graphics);
+        }
+        else if (isDispatchEntryPoint(entryPoint))
+        {
+            contextVk->endEventLog(entryPoint, PipelineType::Compute);
+        }
     }
 }
 
@@ -49,12 +56,10 @@ bool DebugAnnotatorVk::getStatus()
     return true;
 }
 
-bool DebugAnnotatorVk::isDrawOrDispatchEntryPoint(angle::EntryPoint entryPoint) const
+bool DebugAnnotatorVk::isDrawEntryPoint(angle::EntryPoint entryPoint) const
 {
     switch (entryPoint)
     {
-        case angle::EntryPoint::GLDispatchCompute:
-        case angle::EntryPoint::GLDispatchComputeIndirect:
         case angle::EntryPoint::GLDrawArrays:
         case angle::EntryPoint::GLDrawArraysIndirect:
         case angle::EntryPoint::GLDrawArraysInstanced:
@@ -99,4 +104,16 @@ bool DebugAnnotatorVk::isDrawOrDispatchEntryPoint(angle::EntryPoint entryPoint)
     }
 }
 
+bool DebugAnnotatorVk::isDispatchEntryPoint(angle::EntryPoint entryPoint) const
+{
+    switch (entryPoint)
+    {
+        case angle::EntryPoint::GLDispatchCompute:
+        case angle::EntryPoint::GLDispatchComputeIndirect:
+            return true;
+        default:
+            return false;
+    }
+}
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h

@@ -29,7 +29,8 @@ class DebugAnnotatorVk : public angle::LoggingAnnotator
     bool getStatus() override;
 
   private:
-    bool isDrawOrDispatchEntryPoint(angle::EntryPoint entryPoint) const;
+    bool isDrawEntryPoint(angle::EntryPoint entryPoint) const;
+    bool isDispatchEntryPoint(angle::EntryPoint entryPoint) const;
 
     // Note: To avoid any race conditions between threads, this class has no private data; all
     // events are stored in ContextVk.