Vulkan: ATrace marker fix-ups

Fix a couple of mislabled atrace markers and add explicit markers for inside/outside renderpass flushes. Bug: b/156403378 Change-Id: I4045846e54ff54bc8fc3dd6ef47339f6f5eb8e87 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2327828Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Tobin Ehlis <tobine@google.com> Commit-Queue: Tobin Ehlis <tobine@google.com>

Vulkan: ATrace marker fix-ups
a9504808 · Tobin Ehlis · Commit Bot · dcc56215 · a9504808 · a9504808
Commit a9504808 authored Jul 29, 2020 by Tobin Ehlis Committed by Commit Bot Jul 30, 2020
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

CommandProcessor.cpp src/libANGLE/renderer/vulkan/CommandProcessor.cpp +1 -1

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +4 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
+++ b/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
@@ -17,7 +17,7 @@ CommandProcessor::CommandProcessor() : mWorkerThreadIdle(true) {}
 void CommandProcessor::queueCommands(const vk::CommandProcessorTask &commands)
 {
-    ANGLE_TRACE_EVENT0("gpu.angle", "RendererVk::queueCommands");
+    ANGLE_TRACE_EVENT0("gpu.angle", "CommandProcessor::queueCommands");
    std::lock_guard<std::mutex> queueLock(mWorkerMutex);
    ASSERT(commands.commandBuffer == nullptr || !commands.commandBuffer->empty());
    mCommandsQueue.push(commands);

--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -1705,7 +1705,7 @@ angle::Result ContextVk::synchronizeCpuGpuTime()
    // Make sure nothing is running
    ASSERT(!hasRecordedCommands());
-    ANGLE_TRACE_EVENT0("gpu.angle", "RendererVk::synchronizeCpuGpuTime");
+    ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::synchronizeCpuGpuTime");
    // Create a query used to receive the GPU timestamp
    vk::QueryHelper timestampQuery;
@@ -4447,6 +4447,7 @@ angle::Result ContextVk::endRenderPass()
    if (mRenderer->getFeatures().enableCommandProcessingThread.enabled)
    {
        vk::CommandProcessorTask task = {this, &mPrimaryCommands, mRenderPassCommands};
+        ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::flushInsideRenderPassCommands");
        queueCommandsToWorker(task);
        getNextAvailableCommandBuffer(&mRenderPassCommands, true);
    }
@@ -4492,7 +4493,7 @@ void ContextVk::getNextAvailableCommandBuffer(vk::CommandBufferHelper **commandB
 void ContextVk::recycleCommandBuffer(vk::CommandBufferHelper *commandBuffer)
 {
-    ANGLE_TRACE_EVENT0("gpu.angle", "RendererVk::waitForWorkerThreadIdle");
+    ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::recycleCommandBuffer");
    std::lock_guard<std::mutex> queueLock(mCommandBufferQueueMutex);
    ASSERT(commandBuffer->empty());
    mAvailableCommandBuffers.push(commandBuffer);
@@ -4584,6 +4585,7 @@ angle::Result ContextVk::flushOutsideRenderPassCommands()
        if (mRenderer->getFeatures().enableCommandProcessingThread.enabled)
        {
            vk::CommandProcessorTask task = {this, &mPrimaryCommands, mOutsideRenderPassCommands};
+            ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::flushOutsideRenderPassCommands");
            queueCommandsToWorker(task);
            getNextAvailableCommandBuffer(&mOutsideRenderPassCommands, false);
        }