commit 3ea463bfa4ed941977fcb25055bddebe2b749a83
author Jamie Madill <jmadill@chromium.org> Wed Jun 19 14:21:33 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Jun 20 14:35:46 2019 +0000
tree 6303e8806feaad69c3e7bab78571bf1940774fb2
parent e4780c510e7189d5e9ce473fe18c7be955ec3bf4

Move event tracer back into common.

Requires that we update the TRACE_EVENT macros to accept a platform as
an argument. The refactor isn't complete. In order to finish we'd need
to ensure we have the Display's PlatformMethods available at all sites.

Unblocks adding trace events directly in the perf tests.

Bug: angleproject:1892
Bug: angleproject:3117
Change-Id: Iee0ca086ccfe23acab3fc186fb042f018711a94c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1664794
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index d73e2f2..ee031a6 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -24,7 +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"
+#include "libANGLE/trace.h"
 
 namespace rx
 {
@@ -1311,7 +1311,7 @@
                                             RenderTargetVk *renderTarget,
                                             void *pixels)
 {
-    TRACE_EVENT0("gpu.angle", "FramebufferVk::readPixelsImpl");
+    ANGLE_TRACE_EVENT0("gpu.angle", "FramebufferVk::readPixelsImpl");
 
     RendererVk *renderer = contextVk->getRenderer();