Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: src/gpu/GrTracing.h

Issue 1315513008: Cleanup GrDrawTarget now that all paths lead to GrBatch (Closed) Base URL: https://skia.googlesource.com/skia.git@patharray
Patch Set: remove change to SampleApp.cpp Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/GrTest.cpp ('k') | src/gpu/batches/GrStencilPathBatch.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrTracing_DEFINED 8 #ifndef GrTracing_DEFINED
9 #define GrTracing_DEFINED 9 #define GrTracing_DEFINED
10 10
11 #include "GrBufferedDrawTarget.h"
12 #include "GrDrawTarget.h" 11 #include "GrDrawTarget.h"
13 #include "GrGpu.h" 12 #include "GrGpu.h"
14 #include "GrTraceMarker.h" 13 #include "GrTraceMarker.h"
15 #include "SkTLazy.h" 14 #include "SkTLazy.h"
16 #include "SkTraceEvent.h" 15 #include "SkTraceEvent.h"
17 16
18 /** 17 /**
19 * Marker generation class used for adding and removing markers around code bloc ks 18 * Marker generation class used for adding and removing markers around code bloc ks
20 */ 19 */
21 class GrGpuTraceMarkerGenerator : public ::SkNoncopyable { 20 class GrGpuTraceMarkerGenerator : public ::SkNoncopyable {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \ 122 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \
124 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \ 123 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
125 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \ 124 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
126 &SK_MACRO_APPEND_LINE(gpuTracingEnabled) ); \ 125 &SK_MACRO_APPEND_LINE(gpuTracingEnabled) ); \
127 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \ 126 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
128 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ 127 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
129 } 128 }
130 #endif 129 #endif
131 130
132 #endif 131 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrTest.cpp ('k') | src/gpu/batches/GrStencilPathBatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698