Revert "Vulkan:Add debug labels for OpenGL calls"

src/common/debug.cpp

@@ -81,7 +81,7 @@ std::ostream *gSwallowStream;
 
 bool DebugAnnotationsActive()
 {
-#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) || defined(ANGLE_ENABLE_DEBUG_TRACE)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     return g_debugAnnotator != nullptr && g_debugAnnotator->getStatus();
 #else
     return false;

src/libANGLE/renderer/vulkan/BUILD.gn

@@ -27,8 +27,6 @@ _vulkan_backend_sources = [
   "CompilerVk.h",
   "ContextVk.cpp",
   "ContextVk.h",
-  "DebugAnnotatorVk.cpp",
-  "DebugAnnotatorVk.h",
   "DeviceVk.cpp",
   "DeviceVk.h",
   "DisplayVk.cpp",

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -312,14 +312,6 @@ vk::ResourceAccess GetStencilAccess(const gl::DepthStencilState &dsState)
     // Simplify this check by returning write instead of checking the mask.
     return vk::ResourceAccess::Write;
 }
-
-#if defined(ANGLE_ENABLE_DEBUG_TRACE)
-#    define ANGLE_WRITE_EVENT_LOG(context, commandBuffer) writeEventLog(context, commandBuffer)
-#    define ANGLE_END_EVENT_LOG(commandBuffer) commandBuffer->endDebugUtilsLabelEXT()
-#else
-#    define ANGLE_WRITE_EVENT_LOG(context, commandBuffer)
-#    define ANGLE_END_EVENT_LOG(commandBuffer)
-#endif
 }  // anonymous namespace
 
 ANGLE_INLINE void ContextVk::flushDescriptorSetUpdates()
@@ -1095,8 +1087,6 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
     if (dirtyBits.none())
         return angle::Result::Continue;
 
-    ANGLE_WRITE_EVENT_LOG(context, *commandBufferOut);
-
     // Flush any relevant dirty bits.
     for (size_t dirtyBit : dirtyBits)
     {
@@ -1302,7 +1292,6 @@ angle::Result ContextVk::setupDispatch(const gl::Context *context,
     // The following ensures prior commands are flushed before we start processing dirty bits.
     ANGLE_TRY(flushCommandsAndEndRenderPass());
     *commandBufferOut = &mOutsideRenderPassCommands->getCommandBuffer();
-    ANGLE_WRITE_EVENT_LOG(context, *commandBufferOut);
 
     // Create a local object to ensure we flush the descriptor updates to device when we leave this
     // function
@@ -2108,7 +2097,7 @@ angle::Result ContextVk::drawArrays(const gl::Context *context,
                             nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
         commandBuffer->draw(clampedVertexCount, first);
     }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
     return angle::Result::Continue;
 }
 
@@ -2128,15 +2117,12 @@ angle::Result ContextVk::drawArraysInstanced(const gl::Context *context,
                                     gl::DrawElementsType::InvalidEnum, nullptr, &commandBuffer,
                                     &numIndices));
         commandBuffer->drawIndexedInstanced(numIndices, instances);
+        return angle::Result::Continue;
     }
-    else
-    {
-        ANGLE_TRY(setupDraw(context, mode, first, count, instances,
-                            gl::DrawElementsType::InvalidEnum, nullptr, mNonIndexedDirtyBitsMask,
-                            &commandBuffer));
-        commandBuffer->drawInstanced(gl::GetClampedVertexCount<uint32_t>(count), instances, first);
-    }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
+    ANGLE_TRY(setupDraw(context, mode, first, count, instances, gl::DrawElementsType::InvalidEnum,
+                        nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
+    commandBuffer->drawInstanced(gl::GetClampedVertexCount<uint32_t>(count), instances, first);
     return angle::Result::Continue;
 }
 
@@ -2158,16 +2144,13 @@ angle::Result ContextVk::drawArraysInstancedBaseInstance(const gl::Context *cont
                                     &numIndices));
         commandBuffer->drawIndexedInstancedBaseVertexBaseInstance(numIndices, instances, 0, 0,
                                                                   baseInstance);
+        return angle::Result::Continue;
     }
-    else
-    {
-        ANGLE_TRY(setupDraw(context, mode, first, count, instances,
-                            gl::DrawElementsType::InvalidEnum, nullptr, mNonIndexedDirtyBitsMask,
-                            &commandBuffer));
-        commandBuffer->drawInstancedBaseInstance(gl::GetClampedVertexCount<uint32_t>(count),
-                                                 instances, first, baseInstance);
-    }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
+    ANGLE_TRY(setupDraw(context, mode, first, count, instances, gl::DrawElementsType::InvalidEnum,
+                        nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
+    commandBuffer->drawInstancedBaseInstance(gl::GetClampedVertexCount<uint32_t>(count), instances,
+                                             first, baseInstance);
     return angle::Result::Continue;
 }
 
@@ -2190,7 +2173,7 @@ angle::Result ContextVk::drawElements(const gl::Context *context,
         ANGLE_TRY(setupIndexedDraw(context, mode, count, 1, type, indices, &commandBuffer));
         commandBuffer->drawIndexed(count);
     }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
     return angle::Result::Continue;
 }
 
@@ -2214,7 +2197,7 @@ angle::Result ContextVk::drawElementsBaseVertex(const gl::Context *context,
         ANGLE_TRY(setupIndexedDraw(context, mode, count, 1, type, indices, &commandBuffer));
         commandBuffer->drawIndexedBaseVertex(count, baseVertex);
     }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
     return angle::Result::Continue;
 }
 
@@ -2240,7 +2223,6 @@ angle::Result ContextVk::drawElementsInstanced(const gl::Context *context,
     }
 
     commandBuffer->drawIndexedInstanced(count, instances);
-    ANGLE_END_EVENT_LOG(commandBuffer);
     return angle::Result::Continue;
 }
 
@@ -2267,7 +2249,6 @@ angle::Result ContextVk::drawElementsInstancedBaseVertex(const gl::Context *cont
     }
 
     commandBuffer->drawIndexedInstancedBaseVertex(count, instances, baseVertex);
-    ANGLE_END_EVENT_LOG(commandBuffer);
     return angle::Result::Continue;
 }
 
@@ -2289,14 +2270,12 @@ angle::Result ContextVk::drawElementsInstancedBaseVertexBaseInstance(const gl::C
             setupLineLoopDraw(context, mode, 0, count, type, indices, &commandBuffer, &indexCount));
         commandBuffer->drawIndexedInstancedBaseVertexBaseInstance(indexCount, instances, 0,
                                                                   baseVertex, baseInstance);
+        return angle::Result::Continue;
     }
-    else
-    {
-        ANGLE_TRY(setupIndexedDraw(context, mode, count, instances, type, indices, &commandBuffer));
-        commandBuffer->drawIndexedInstancedBaseVertexBaseInstance(count, instances, 0, baseVertex,
-                                                                  baseInstance);
-    }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+
+    ANGLE_TRY(setupIndexedDraw(context, mode, count, instances, type, indices, &commandBuffer));
+    commandBuffer->drawIndexedInstancedBaseVertexBaseInstance(count, instances, 0, baseVertex,
+                                                              baseInstance);
     return angle::Result::Continue;
 }
 
@@ -2370,16 +2349,13 @@ angle::Result ContextVk::drawArraysIndirect(const gl::Context *context,
                                             &dstIndirectBuf, &dstIndirectBufOffset));
 
         commandBuffer->drawIndexedIndirect(dstIndirectBuf->getBuffer(), dstIndirectBufOffset, 1, 0);
+        return angle::Result::Continue;
     }
-    else
-    {
-        ANGLE_TRY(setupIndirectDraw(context, mode, mNonIndexedDirtyBitsMask, currentIndirectBuf,
-                                    currentIndirectBufOffset, &commandBuffer));
 
-        commandBuffer->drawIndirect(currentIndirectBuf->getBuffer(), currentIndirectBufOffset, 1,
-                                    0);
-    }
-    ANGLE_END_EVENT_LOG(commandBuffer);
+    ANGLE_TRY(setupIndirectDraw(context, mode, mNonIndexedDirtyBitsMask, currentIndirectBuf,
+                                currentIndirectBufOffset, &commandBuffer));
+
+    commandBuffer->drawIndirect(currentIndirectBuf->getBuffer(), currentIndirectBufOffset, 1, 0);
     return angle::Result::Continue;
 }
 
@@ -2454,7 +2430,6 @@ angle::Result ContextVk::drawElementsIndirect(const gl::Context *context,
 
     commandBuffer->drawIndexedIndirect(currentIndirectBuf->getBuffer(), currentIndirectBufOffset, 1,
                                        0);
-    ANGLE_END_EVENT_LOG(commandBuffer);
     return angle::Result::Continue;
 }
 
@@ -2652,56 +2627,6 @@ angle::Result ContextVk::popDebugGroup(const gl::Context *context)
     return angle::Result::Continue;
 }
 
-void ContextVk::writeEventLog(const gl::Context *context, vk::CommandBuffer *commandBuffer)
-{
-    if (mEventLog.empty())
-    {
-        return;
-    }
-
-    // Insert OpenGL ES commands into debug label.  We create a 3-level cascade here for
-    // OpenGL-ES-first debugging in AGI.  Here's the general outline of commands:
-    // -glDrawCommand
-    // --vkCmdBeginDebugUtilsLabelEXT() #1 for "glDrawCommand"
-    // --OpenGL ES Commands
-    // ---vkCmdBeginDebugUtilsLabelEXT() #2 for "OpenGL ES Commands"
-    // ---Individual OpenGL ES Commands leading up to glDrawCommand
-    // ----vkCmdBeginDebugUtilsLabelEXT() #3 for each individual OpenGL ES Command
-    // ----vkCmdEndDebugUtilsLabelEXT() #3 for each individual OpenGL ES Command
-    // ----...More Individual OGL Commands...
-    // ----Final Individual OGL command will be the same glDrawCommand shown in #1 above
-    // ---vkCmdEndDebugUtilsLabelEXT() #2 for "OpenGL ES Commands"
-    // --VK SetupDraw & Draw-related commands will be embedded here under glDraw #1
-    // --vkCmdEndDebugUtilsLabelEXT() #1 is called after each vkDraw* or vkDispatch* call
-    VkDebugUtilsLabelEXT label = {VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
-                                  nullptr,
-                                  mEventLog.back().c_str(),
-                                  {0.0f, 0.0f, 0.0f, 0.0f}};
-    // This is #1 from comment above
-    commandBuffer->beginDebugUtilsLabelEXT(label);
-    std::string oglCmds = "OpenGL ES Commands";
-    label.pLabelName    = oglCmds.c_str();
-    // This is #2 from comment above
-    commandBuffer->beginDebugUtilsLabelEXT(label);
-    for (uint32_t i = 0; i < mEventLog.size(); ++i)
-    {
-        label.pLabelName = mEventLog[i].c_str();
-        // NOTE: We have to use a begin/end pair here because AGI does not promote the
-        // pLabelName from an insertDebugUtilsLabelEXT() call to the Commands panel.
-        // Internal bug b/169243237 is tracking this and once the insert* call shows the
-        // pLabelName similar to begin* call, we can switch these to insert* calls instead.
-        // This is #3 from comment above.
-        // TODO(ianelliott): Transfer the bug to a publicly-visible bug.
-        commandBuffer->beginDebugUtilsLabelEXT(label);
-        commandBuffer->endDebugUtilsLabelEXT();
-    }
-    commandBuffer->endDebugUtilsLabelEXT();
-    // The final end* call for #1 above is made in the ContextVk::draw* or
-    //  ContextVk::dispatch* function calls.
-
-    mEventLog.clear();
-}
-
 bool ContextVk::isViewportFlipEnabledForDrawFBO() const
 {
     return mFlipViewportForDrawFramebuffer && mFlipYForCurrentSurface;
@@ -3663,8 +3588,6 @@ angle::Result ContextVk::dispatchCompute(const gl::Context *context,
 
     commandBuffer->dispatch(numGroupsX, numGroupsY, numGroupsZ);
 
-    ANGLE_END_EVENT_LOG(commandBuffer);
-
     return angle::Result::Continue;
 }
 
@@ -3680,8 +3603,6 @@ angle::Result ContextVk::dispatchComputeIndirect(const gl::Context *context, GLi
 
     commandBuffer->dispatchIndirect(buffer.getBuffer(), indirect);
 
-    ANGLE_END_EVENT_LOG(commandBuffer);
-
     return angle::Result::Continue;
 }
 

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -261,9 +261,6 @@ class ContextVk : public ContextImpl, public vk::Context
                                  const std::string &message) override;
     angle::Result popDebugGroup(const gl::Context *context) override;
 
-    // Record GL API calls for debuggers
-    void logEvent(const char *eventString) { mEventLog.push_back(eventString); }
-
     bool isViewportFlipEnabledForDrawFBO() const;
     bool isViewportFlipEnabledForReadFBO() const;
     // When the device/surface is rotated such that the surface's aspect ratio is different than
@@ -955,9 +952,6 @@ class ContextVk : public ContextImpl, public vk::Context
     bool shouldSwitchToReadOnlyDepthFeedbackLoopMode(const gl::Context *context,
                                                      gl::Texture *texture) const;
 
-    // Record GL API calls for debuggers
-    void writeEventLog(const gl::Context *context, vk::CommandBuffer *commandBuffer);
-
     std::array<DirtyBitHandler, DIRTY_BIT_MAX> mGraphicsDirtyBitHandlers;
     std::array<DirtyBitHandler, DIRTY_BIT_MAX> mComputeDirtyBitHandlers;
 
@@ -1155,9 +1149,6 @@ class ContextVk : public ContextImpl, public vk::Context
     vk::DynamicBuffer mStagingBuffer;
 
     std::vector<std::string> mCommandBufferDiagnostics;
-
-    // Record GL API calls for debuggers
-    std::vector<std::string> mEventLog;
 };
 
 ANGLE_INLINE angle::Result ContextVk::endRenderPassIfTransformFeedbackBuffer(

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp

-//
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// DebugAnnotatorVk.cpp: Vulkan helpers for adding trace annotations.
-//
-
-#include "libANGLE/renderer/vulkan/DebugAnnotatorVk.h"
-#include "libANGLE/Context.h"
-#include "libANGLE/renderer/vulkan/ContextVk.h"
-
-namespace rx
-{
-
-DebugAnnotatorVk::DebugAnnotatorVk() {}
-
-DebugAnnotatorVk::~DebugAnnotatorVk() {}
-
-void DebugAnnotatorVk::beginEvent(gl::Context *context,
-                                  const char *eventName,
-                                  const char *eventMessage)
-{
-    angle::LoggingAnnotator::beginEvent(context, eventName, eventMessage);
-    if (context)
-    {
-        ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
-        contextVk->logEvent(eventMessage);
-    }
-}
-
-void DebugAnnotatorVk::endEvent(const char *eventName)
-{
-    angle::LoggingAnnotator::endEvent(eventName);
-}
-
-bool DebugAnnotatorVk::getStatus()
-{
-    return true;
-}
-
-}  // namespace rx

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h

-//
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// DebugAnnotatorVk.h: Vulkan helpers for adding trace annotations.
-//
-
-#ifndef LIBANGLE_RENDERER_VULKAN_DEBUGANNOTATORVK_H_
-#define LIBANGLE_RENDERER_VULKAN_DEBUGANNOTATORVK_H_
-
-#include "libANGLE/LoggingAnnotator.h"
-
-namespace rx
-{
-
-class DebugAnnotatorVk : public angle::LoggingAnnotator
-{
-  public:
-    DebugAnnotatorVk();
-    ~DebugAnnotatorVk() override;
-    void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
-    void endEvent(const char *eventName) override;
-    bool getStatus() override;
-
-    // Note: To avoid any race conditions between threads, this class has no private data; all
-    // events are stored in ContextVk.
-};
-
-}  // namespace rx
-
-#endif  // LIBANGLE_RENDERER_VULKAN_DEBUGANNOTATORVK_H_

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -902,14 +902,11 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
     // Initialize the format table.
     mFormatTable.initialize(this, &mNativeTextureCaps, &mNativeCaps.compressedTextureFormats);
 
-    gl::InitializeDebugAnnotations(&mAnnotator);
-
     if (getFeatures().enableCommandProcessingThread.enabled)
     {
         mCommandProcessorThread =
             std::thread(&CommandProcessor::processCommandProcessorTasks, &mCommandProcessor);
     }
-
     return angle::Result::Continue;
 }
 

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -27,7 +27,6 @@
 #include "libANGLE/BlobCache.h"
 #include "libANGLE/Caps.h"
 #include "libANGLE/renderer/vulkan/CommandProcessor.h"
-#include "libANGLE/renderer/vulkan/DebugAnnotatorVk.h"
 #include "libANGLE/renderer/vulkan/QueryVk.h"
 #include "libANGLE/renderer/vulkan/ResourceVk.h"
 #include "libANGLE/renderer/vulkan/UtilsVk.h"
@@ -370,8 +369,6 @@ class RendererVk : angle::NonCopyable
     std::string mLastValidationMessage;
     uint32_t mValidationMessageCount;
 
-    DebugAnnotatorVk mAnnotator;
-
     // How close to VkPhysicalDeviceLimits::maxMemoryAllocationCount we allow ourselves to get
     static constexpr double kPercentMaxMemoryAllocationCount = 0.3;
     // How many objects to garbage collect before issuing a flush()