diff options
| author |  Brian Osman <brianosman@google.com> | 2017-07-25 16:58:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-26 12:58:59 +0000 |
| commit | a9340ba98050c31770c7acb8284b4b2474dc4a18 (patch) | |
| tree | 0345deab45ff7b0e4312a8889d7b9cfa8b14c144 /src/gpu | |
| parent | 7a0ba1c1323d3cdad3057d393596692d54011e91 (diff) | |
Tracing macro cleanup continued
- Remove one especially chatty event, and one pointless test
- Use TRACE_FUNC everywhere, rather than manual strings
Bug: skia:
Change-Id: Icb795294009150ca9a260436738d79546a733337
Reviewed-on: https://skia-review.googlesource.com/26701
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrDrawOpAtlas.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkCopyManager.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp index f4f0883ccf..4904e248fc 100644 --- a/src/gpu/GrDrawOpAtlas.cpp +++ b/src/gpu/GrDrawOpAtlas.cpp @@ -131,7 +131,7 @@ void GrDrawOpAtlas::Plot::uploadToTexture(GrDrawOp::WritePixelsFn& writePixels, GrTexture* texture) { // We should only be issuing uploads if we are in fact dirty SkASSERT(fDirty && fData && texture); - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrDrawOpAtlas::Plot::uploadToTexture"); + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), TRACE_FUNC); size_t rowBytes = fBytesPerPixel * fWidth; const unsigned char* dataPtr = fData; dataPtr += rowBytes * fDirtyRect.fTop; diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 0bab551bc5..5c39d08340 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -3459,7 +3459,7 @@ bool GrGLGpu::onCopySurface(GrSurface* dst, } bool GrGLGpu::createCopyProgram(GrTexture* srcTex) { - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLGpu::createCopyProgram()"); + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC); int progIdx = TextureToCopyProgramIdx(srcTex); const GrShaderCaps* shaderCaps = this->caps()->shaderCaps(); @@ -3738,7 +3738,7 @@ bool GrGLGpu::createMipmapProgram(int progIdx) { } bool GrGLGpu::createStencilClipClearProgram() { - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLGpu::createStencilClipClearProgram()"); + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC); if (!fStencilClipClearArrayBuffer) { static const GrGLfloat vdata[] = {-1, -1, 1, -1, -1, 1, 1, 1}; diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 55557a55e1..6326550709 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -98,7 +98,7 @@ bool GrGLProgramBuilder::compileAndAttachShaders(GrGLSLShaderBuilder& shader, } GrGLProgram* GrGLProgramBuilder::finalize() { - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLProgramBuilder::finalize()"); + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC); // verify we can get a program id GrGLuint programID; diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp index f0dc60297b..08eb4f05b3 100644 --- a/src/gpu/vk/GrVkCopyManager.cpp +++ b/src/gpu/vk/GrVkCopyManager.cpp @@ -34,7 +34,7 @@ GrVkCopyManager::GrVkCopyManager() GrVkCopyManager::~GrVkCopyManager() {} bool GrVkCopyManager::createCopyProgram(GrVkGpu* gpu) { - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrVkCopyManager::createCopyProgram()"); + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC); const GrShaderCaps* shaderCaps = gpu->caps()->shaderCaps(); const char* version = shaderCaps->versionDeclString(); |