commit e39526b9d9aa419fca6ff38deeabe18c431e0d60
author Brian Salomon <bsalomon@google.com> Mon Jun 24 16:35:53 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 25 02:57:23 2019 +0000
tree c9c3eaae75592bdf07f9df270fa372604bb0e84a
parent 1ae6ac81e68a98067d82b64a22af141a3c06f288

Trace events in Gr[Vk]Gpu, GrVkCommandBuffer, GrVkCommandPool, and GrVkResoureProvider.

Make existing trace events in GrGpu go direct to TRACE_EVENT0.

Bug: chromium:919885
Change-Id: Ica270125eb614a31860fd3ad4b78178e7bd24296
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223336
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrGpu.cpp

diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 1f38b77..52adb00 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -100,7 +100,7 @@
 
 sk_sp<GrTexture> GrGpu::createTexture(const GrSurfaceDesc& origDesc, SkBudgeted budgeted,
                                       const GrMipLevel texels[], int mipLevelCount) {
-    GR_CREATE_TRACE_MARKER_CONTEXT("GrGpu", "createTexture", fContext);
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     GrSurfaceDesc desc = origDesc;
 
     GrMipMapped mipMapped = mipLevelCount > 1 ? GrMipMapped::kYes : GrMipMapped::kNo;
@@ -215,6 +215,7 @@
 
 sk_sp<GrGpuBuffer> GrGpu::createBuffer(size_t size, GrGpuBufferType intendedType,
                                        GrAccessPattern accessPattern, const void* data) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     this->handleDirtyContext();
     sk_sp<GrGpuBuffer> buffer = this->onCreateBuffer(size, intendedType, accessPattern, data);
     if (!this->caps()->reuseScratchBuffers()) {
@@ -225,7 +226,7 @@
 
 bool GrGpu::copySurface(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
                         const SkIPoint& dstPoint, bool canDiscardOutsideDstRect) {
-    GR_CREATE_TRACE_MARKER_CONTEXT("GrGpu", "copySurface", fContext);
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(dst && src);
 
     if (dst->readOnly()) {
@@ -239,6 +240,7 @@
 
 bool GrGpu::readPixels(GrSurface* surface, int left, int top, int width, int height,
                        GrColorType dstColorType, void* buffer, size_t rowBytes) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(surface);
 
     int bpp = GrColorTypeBytesPerPixel(dstColorType);
@@ -260,6 +262,7 @@
 
 bool GrGpu::writePixels(GrSurface* surface, int left, int top, int width, int height,
                         GrColorType srcColorType, const GrMipLevel texels[], int mipLevelCount) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(surface);
 
     if (surface->readOnly()) {
@@ -298,6 +301,7 @@
 bool GrGpu::transferPixelsTo(GrTexture* texture, int left, int top, int width, int height,
                              GrColorType bufferColorType, GrGpuBuffer* transferBuffer,
                              size_t offset, size_t rowBytes) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(texture);
     SkASSERT(transferBuffer);
 
@@ -327,6 +331,7 @@
 bool GrGpu::transferPixelsFrom(GrSurface* surface, int left, int top, int width, int height,
                                GrColorType bufferColorType, GrGpuBuffer* transferBuffer,
                                size_t offset) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(surface);
     SkASSERT(transferBuffer);
     SkASSERT(this->caps()->transferFromOffsetAlignment(bufferColorType));
@@ -349,6 +354,7 @@
 }
 
 bool GrGpu::regenerateMipMapLevels(GrTexture* texture) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(texture);
     SkASSERT(this->caps()->mipMapSupport());
     SkASSERT(texture->texturePriv().mipMapped() == GrMipMapped::kYes);
@@ -411,6 +417,7 @@
                                          SkSurface::BackendSurfaceAccess access,
                                          const GrFlushInfo& info,
                                          const GrPrepareForExternalIORequests& externalRequests) {
+    TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     this->stats()->incNumFinishFlushes();
     GrResourceProvider* resourceProvider = fContext->priv().resourceProvider();