Vulkan: Add more debug labels handling with graph off.

Bug: angleproject:4029
Change-Id: Ia3c88af5f9fa1a7940d7f809ded599c064126be7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2055555
Commit-Queue: Jamie Madill <[email protected]>
Reviewed-by: Tim Van Patten <[email protected]>
Reviewed-by: Cody Northrop <[email protected]>

Author: null77

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -2305,46 +2305,64 @@ std::string ContextVk::getRendererDescription() const
 
 angle::Result ContextVk::insertEventMarker(GLsizei length, const char *marker)
 {
+    if (!mRenderer->enableDebugUtils())
+        return angle::Result::Continue;
+
     if (commandGraphEnabled())
     {
         std::string markerStr(marker, length <= 0 ? strlen(marker) : length);
         mCommandGraph.insertDebugMarker(GL_DEBUG_SOURCE_APPLICATION, std::move(marker));
     }
     else
     {
-        // TODO(jmadill): http://anglebug.com/4029
-        UNIMPLEMENTED();
+        vk::PrimaryCommandBuffer *primary;
+        ANGLE_TRY(getPrimaryCommandBuffer(&primary));
+
+        VkDebugUtilsLabelEXT label;
+        vk::MakeDebugUtilsLabel(GL_DEBUG_SOURCE_APPLICATION, marker, &label);
+        primary->insertDebugUtilsLabelEXT(label);
     }
 
     return angle::Result::Continue;
 }
 
 angle::Result ContextVk::pushGroupMarker(GLsizei length, const char *marker)
 {
+    if (!mRenderer->enableDebugUtils())
+        return angle::Result::Continue;
+
     if (commandGraphEnabled())
     {
         std::string markerStr(marker, length <= 0 ? strlen(marker) : length);
         mCommandGraph.pushDebugMarker(GL_DEBUG_SOURCE_APPLICATION, std::move(marker));
     }
     else
     {
-        // TODO(jmadill): http://anglebug.com/4029
-        UNIMPLEMENTED();
+        vk::PrimaryCommandBuffer *primary;
+        ANGLE_TRY(getPrimaryCommandBuffer(&primary));
+
+        VkDebugUtilsLabelEXT label;
+        vk::MakeDebugUtilsLabel(GL_DEBUG_SOURCE_APPLICATION, marker, &label);
+        primary->beginDebugUtilsLabelEXT(label);
     }
 
     return angle::Result::Continue;
 }
 
 angle::Result ContextVk::popGroupMarker()
 {
+    if (!mRenderer->enableDebugUtils())
+        return angle::Result::Continue;
+
     if (commandGraphEnabled())
     {
         mCommandGraph.popDebugMarker();
     }
     else
     {
-        // TODO(jmadill): http://anglebug.com/4029
-        UNIMPLEMENTED();
+        vk::PrimaryCommandBuffer *primary;
+        ANGLE_TRY(getPrimaryCommandBuffer(&primary));
+        primary->endDebugUtilsLabelEXT();
     }
 
     return angle::Result::Continue;
@@ -2355,40 +2373,40 @@ angle::Result ContextVk::pushDebugGroup(const gl::Context *context,
                                         GLuint id,
                                         const std::string &message)
 {
+    if (!mRenderer->enableDebugUtils())
+        return angle::Result::Continue;
+
     if (commandGraphEnabled())
     {
         mCommandGraph.insertDebugMarker(source, std::string(message));
     }
     else
     {
-        if (mRenderer->enableDebugUtils())
-        {
-            vk::PrimaryCommandBuffer *primary;
-            ANGLE_TRY(getPrimaryCommandBuffer(&primary));
+        vk::PrimaryCommandBuffer *primary;
+        ANGLE_TRY(getPrimaryCommandBuffer(&primary));
 
-            VkDebugUtilsLabelEXT label;
-            vk::MakeDebugUtilsLabel(source, message.c_str(), &label);
-            primary->insertDebugUtilsLabelEXT(label);
-        }
+        VkDebugUtilsLabelEXT label;
+        vk::MakeDebugUtilsLabel(source, message.c_str(), &label);
+        primary->insertDebugUtilsLabelEXT(label);
     }
 
     return angle::Result::Continue;
 }
 
 angle::Result ContextVk::popDebugGroup(const gl::Context *context)
 {
+    if (!mRenderer->enableDebugUtils())
+        return angle::Result::Continue;
+
     if (commandGraphEnabled())
     {
         mCommandGraph.popDebugMarker();
     }
     else
     {
-        if (mRenderer->enableDebugUtils())
-        {
-            vk::PrimaryCommandBuffer *primary;
-            ANGLE_TRY(getPrimaryCommandBuffer(&primary));
-            primary->endDebugUtilsLabelEXT();
-        }
+        vk::PrimaryCommandBuffer *primary;
+        ANGLE_TRY(getPrimaryCommandBuffer(&primary));
+        primary->endDebugUtilsLabelEXT();
     }
 
     return angle::Result::Continue;