Vulkan: Fix AGI hierarchy for clear commands

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -3046,6 +3046,11 @@ angle::Result ContextVk::handleNoopDrawEvent()
     return handleDirtyEventLogImpl(mRenderPassCommandBuffer);
 }
 
+angle::Result ContextVk::handleMidRenderPassClearEvent()
+{
+    return handleDirtyEventLogImpl(mRenderPassCommandBuffer);
+}
+
 bool ContextVk::isViewportFlipEnabledForDrawFBO() const
 {
     return mFlipViewportForDrawFramebuffer && mFlipYForCurrentSurface;

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -616,6 +616,8 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
 
     void onProgramExecutableReset(ProgramExecutableVk *executableVk);
 
+    angle::Result handleMidRenderPassClearEvent();
+
   private:
     // Dirty bits.
     enum DirtyBitType : size_t

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp

@@ -40,7 +40,7 @@ void DebugAnnotatorVk::endEvent(gl::Context *context,
     if (vkCmdBeginDebugUtilsLabelEXT && context)
     {
         ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
-        if (isDrawEntryPoint(entryPoint))
+        if (isDrawOrClearEntryPoint(entryPoint))
         {
             contextVk->endEventLog(entryPoint, PipelineType::Graphics);
         }
@@ -56,10 +56,15 @@ bool DebugAnnotatorVk::getStatus()
     return true;
 }
 
-bool DebugAnnotatorVk::isDrawEntryPoint(angle::EntryPoint entryPoint) const
+bool DebugAnnotatorVk::isDrawOrClearEntryPoint(angle::EntryPoint entryPoint) const
 {
     switch (entryPoint)
     {
+        case angle::EntryPoint::GLClear:
+        case angle::EntryPoint::GLClearBufferfi:
+        case angle::EntryPoint::GLClearBufferfv:
+        case angle::EntryPoint::GLClearBufferiv:
+        case angle::EntryPoint::GLClearBufferuiv:
         case angle::EntryPoint::GLDrawArrays:
         case angle::EntryPoint::GLDrawArraysIndirect:
         case angle::EntryPoint::GLDrawArraysInstanced:

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h

@@ -29,7 +29,7 @@ class DebugAnnotatorVk : public angle::LoggingAnnotator
     bool getStatus() override;
 
   private:
-    bool isDrawEntryPoint(angle::EntryPoint entryPoint) const;
+    bool isDrawOrClearEntryPoint(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

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -2344,6 +2344,9 @@ angle::Result FramebufferVk::clearWithCommand(ContextVk *contextVk,
         updateRenderPassReadOnlyDepthMode(contextVk, renderpassCommands);
     }
 
+    // Emit debug-util markers for this mid-render-pass clear
+    ANGLE_TRY(contextVk->handleMidRenderPassClearEvent());
+
     VkClearRect rect                           = {};
     rect.rect.extent.width                     = scissoredRenderArea.width;
     rect.rect.extent.height                    = scissoredRenderArea.height;