diff options
| author |  egdaniel <egdaniel@google.com> | 2014-08-04 12:54:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-04 12:54:39 -0700 |
| commit | 6d7f5faeb3f1745bd1fb90c8a2a0655a9e416e4a (patch) | |
| tree | cf136a73adabcfef6fcb860b7e9f3e2e19bbfc22 /src | |
| parent | ad82ed67dfa5514a17dcca0412c81756b3b03095 (diff) | |
Enable gpu Debug markers if tracing category skia.gpu is enabled
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/438023004
Diffstat (limited to 'src')
| -rwxr-xr-x | src/gpu/GrContext.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrDrawTarget.h | 5 | ||||
| -rw-r--r-- | src/gpu/GrTracing.h | 23 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index c3f3c33f73..474040379f 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -110,7 +110,6 @@ GrContext::GrContext() { fOvalRenderer = NULL; fViewMatrix.reset(); fMaxTextureSizeOverride = 1 << 20; - fGpuTracingEnabled = false; } bool GrContext::init(GrBackend backend, GrBackendContext backendContext) { diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index bd25a18e50..befa81a0d4 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -547,11 +547,6 @@ public: const GrDeviceCoordTexture* dstCopy) { this->onDrawPaths(pathRange, indices, count, transforms, transformsType, fill, dstCopy); } - - inline bool isGpuTracingEnabled() const { - return this->getContext()->isGpuTracingEnabled(); - } - //////////////////////////////////////////////////////////////////////////// /** diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h index efe0fce4a1..3327e2c95e 100644 --- a/src/gpu/GrTracing.h +++ b/src/gpu/GrTracing.h @@ -85,14 +85,16 @@ private: INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \ "id", name_counter, ##__VA_ARGS__); -#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ - GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \ - if (target->isGpuTracingEnabled()) { \ - SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ +#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ + GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \ + bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \ + TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \ + &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \ + if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \ + SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ } - #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context) \ INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context) @@ -112,10 +114,13 @@ private: INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \ "id", name_counter, ##__VA_ARGS__); -#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \ - GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \ - if (context->isGpuTracingEnabled()) { \ - SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ +#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \ + GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \ + bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \ + TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \ + &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \ + if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \ + SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ } #endif |