Don't call {begin|end}DebugUtilsLabelEXT() when not enabled

The ContextVk::handleDirtyEventLogImpl() and ContextVk::endEventLog() methods called the {begin|end}DebugUtilsLabelEXT() methods when the VK_EXT_debug_utils extension is not enabled. This manifests when enabling/using VVL stand-alone (i.e. when the the debug-utils extension is not also present). Bug: b/183133198 Change-Id: I043b174d457a8796831184c092661f24b33c1db4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2821943 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Tim Van Patten <timvp@google.com>

Don't call {begin|end}DebugUtilsLabelEXT() when not enabled
9c51f93d · Ian Elliott · Commit Bot · bf6e074f · 9c51f93d
Commit 9c51f93d authored Apr 12, 2021 by Ian Elliott Committed by Commit Bot Apr 14, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -1226,7 +1226,7 @@ angle::Result ContextVk::handleDirtyComputeEventLog()
 angle::Result ContextVk::handleDirtyEventLogImpl(vk::CommandBuffer *commandBuffer)
 {
-    if (mEventLog.empty())
+    if (mEventLog.empty() || !mRenderer->enableDebugUtils())
    {
        return angle::Result::Continue;
    }
@@ -2781,6 +2781,11 @@ void ContextVk::logEvent(const char *eventString)
 void ContextVk::endEventLog(angle::EntryPoint entryPoint)
 {
+    if (!mRenderer->enableDebugUtils())
+    {
+        return;
+    }
    ASSERT(mRenderPassCommands);
    mRenderPassCommands->getCommandBuffer().endDebugUtilsLabelEXT();
 }