Vulkan: Add trace markers

src/libANGLE/renderer/vulkan/BufferVk.cpp

@@ -14,6 +14,7 @@
 #include "libANGLE/Context.h"
 #include "libANGLE/renderer/vulkan/ContextVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -176,6 +177,7 @@ angle::Result BufferVk::getIndexRange(const gl::Context *context,
         return angle::Result::Continue;
     }
 
+    TRACE_EVENT0("gpu.angle", "BufferVk::getIndexRange");
     // Needed before reading buffer or we could get stale data.
     ANGLE_TRY(renderer->finish(contextVk));
 

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -16,6 +16,7 @@
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/SurfaceVk.h"
 #include "libANGLE/renderer/vulkan/SyncVk.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -81,6 +82,7 @@ DeviceImpl *DisplayVk::createDevice()
 
 egl::Error DisplayVk::waitClient(const gl::Context *context)
 {
+    TRACE_EVENT0("gpu.angle", "DisplayVk::waitClient");
     return angle::ToEGL(mRenderer->finish(this), this, EGL_BAD_ACCESS);
 }
 

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -24,6 +24,7 @@
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/SurfaceVk.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -1096,6 +1097,7 @@ angle::Result FramebufferVk::readPixelsImpl(ContextVk *contextVk,
                                             RenderTargetVk *renderTarget,
                                             void *pixels)
 {
+    TRACE_EVENT0("gpu.angle", "FramebufferVk::readPixelsImpl");
     RendererVk *renderer = contextVk->getRenderer();
 
     ANGLE_TRY(renderTarget->ensureImageInitialized(contextVk));

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -31,7 +31,6 @@
 #include "libANGLE/renderer/vulkan/vk_caps_utils.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
 #include "platform/Platform.h"
-
 #include "third_party/trace_event/trace_event.h"
 
 // Consts
@@ -1281,6 +1280,7 @@ angle::Result RendererVk::checkCompletedCommands(vk::Context *context)
         mLastCompletedQueueSerial = batch.serial;
 
         batch.fence.destroy(mDevice);
+        TRACE_EVENT0("gpu.angle", "commandPool.destroy");
         batch.commandPool.destroy(mDevice);
         ++finishedCount;
     }

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -16,6 +16,7 @@
 #include "libANGLE/renderer/vulkan/FramebufferVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -617,6 +618,7 @@ angle::Result TextureVk::copyImageDataToBuffer(ContextVk *contextVk,
                                                const gl::Rectangle &sourceArea,
                                                uint8_t **outDataPtr)
 {
+    TRACE_EVENT0("gpu.angle", "TextureVk::copyImageDataToBuffer");
     // Make sure the source is initialized and it's images are flushed.
     ANGLE_TRY(ensureImageInitialized(contextVk));
 

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

@@ -18,6 +18,7 @@
 #include "libANGLE/renderer/vulkan/FramebufferVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -261,6 +262,7 @@ angle::Result VertexArrayVk::convertVertexBufferCpu(ContextVk *contextVk,
                                                     size_t attribIndex,
                                                     const vk::Format &vertexFormat)
 {
+    TRACE_EVENT0("gpu.angle", "VertexArrayVk::convertVertexBufferCpu");
     // Needed before reading buffer or we could get stale data.
     ANGLE_TRY(contextVk->getRenderer()->finish(contextVk));
 
@@ -660,6 +662,7 @@ angle::Result VertexArrayVk::updateIndexTranslation(ContextVk *contextVk,
         // as well support the ubyte to ushort case with correct handling of primitive restart.
         // http://anglebug.com/3003
 
+        TRACE_EVENT0("gpu.angle", "VertexArrayVk::updateIndexTranslation");
         // Needed before reading buffer or we could get stale data.
         ANGLE_TRY(renderer->finish(contextVk));
 

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -15,6 +15,7 @@
 #include "libANGLE/renderer/vulkan/FramebufferVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/vk_utils.h"
+#include "third_party/trace_event/trace_event.h"
 
 namespace rx
 {
@@ -949,6 +950,7 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *con
 {
     if (glIndexType == gl::DrawElementsType::UnsignedByte)
     {
+        TRACE_EVENT0("gpu.angle", "LineLoopHelper::getIndexBufferForElementArrayBuffer");
         // Needed before reading buffer or we could get stale data.
         ANGLE_TRY(contextVk->getRenderer()->finish(contextVk));