diff options
| author |  Brian Osman <brianosman@google.com> | 2017-07-26 09:36:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-26 14:22:19 +0000 |
| commit | 39c08ac3be30f9956cea7c5e4fd9a1d86e993a65 (patch) | |
| tree | 0a51e1be04f6f4bbbc30e2082019316a43d4fbbf /src/gpu/gl | |
| parent | 9ac801c12c48b67b48e5a8ef2876a093b7de73fc (diff) | |
Automatically prepend "disabled-by-default-" to TRACE categories
Ensures that all Skia events are disabled by default in Chrome, and
eliminates redundant typing.
Bug: skia:
Change-Id: I289c5e5a01084fcf4cccf512da65a4727f4aeca2
Reviewed-on: https://skia-review.googlesource.com/26880
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 5c39d08340..5209e3e2c9 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"), TRACE_FUNC); + TRACE_EVENT0("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"), TRACE_FUNC); + TRACE_EVENT0("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 6326550709..dc70bd6b69 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"), TRACE_FUNC); + TRACE_EVENT0("skia", TRACE_FUNC); // verify we can get a program id GrGLuint programID; diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index 92e3ffab24..3273218b5f 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -106,14 +106,14 @@ GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx, // Trace event for shader preceding driver compilation bool traceShader; - TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), &traceShader); + TRACE_EVENT_CATEGORY_GROUP_ENABLED("skia.gpu", &traceShader); if (traceShader) { SkString shaderDebugString; print_shaders_line_by_line(skslStrings, lengths, count, glsl, [&](const char* ln) { shaderDebugString.append(ln); shaderDebugString.append("\n"); }); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "skia_gpu::GLShader", + TRACE_EVENT_INSTANT1("skia.gpu", "skia_gpu::GLShader", TRACE_EVENT_SCOPE_THREAD, "shader", TRACE_STR_COPY(shaderDebugString.c_str())); } |