Vulkan: ATrace marker fix-ups

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);

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);
         }