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 <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Vulkan: Add more debug labels handling with graph off.
798a8375 · Jamie Madill · Commit Bot · 12a36dd9 · 798a8375
Commit 798a8375 authored Feb 14, 2020 by Jamie Madill Committed by Commit Bot Feb 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 38 additions and 20 deletions

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +38 -20

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -2305,6 +2305,9 @@ 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);
@@ -2312,8 +2315,12 @@ angle::Result ContextVk::insertEventMarker(GLsizei length, const char *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;
@@ -2321,6 +2328,9 @@ angle::Result ContextVk::insertEventMarker(GLsizei length, const char *marker)

 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);
@@ -2328,8 +2338,12 @@ angle::Result ContextVk::pushGroupMarker(GLsizei length, const char *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;
@@ -2337,14 +2351,18 @@ angle::Result ContextVk::pushGroupMarker(GLsizei length, const char *marker)

 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,21 +2373,21 @@ 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;
@@ -2377,18 +2395,18 @@ angle::Result ContextVk::pushDebugGroup(const gl::Context *context,

 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;