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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 379223004: Add macro so that gpu trace marker can add an arg to the TRACE_EVENT it makes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Use internal_trace_event due to VS "unique" macro expansion Created 6 years, 5 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/GrContext.cpp ('k') | no next file » | 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
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 private: 59 private:
60 GrContext* fContext; 60 GrContext* fContext;
61 SkTLazy<GrGpuTraceMarker> fTraceMarker; 61 SkTLazy<GrGpuTraceMarker> fTraceMarker;
62 }; 62 };
63 63
64 /** 64 /**
65 * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both 65 * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both
66 * cpu and gpu (if gpu tracing enabled) for the current scope. 66 * cpu and gpu (if gpu tracing enabled) for the current scope.
67 * marker is of type const char* and target is of type GrDrawTarget* 67 * marker is of type const char* and target is of type GrDrawTarget*
68 */ 68 */
69 #define GR_CREATE_TRACE_MARKER(name, target) \ 69 #define GR_CREATE_TRACE_MARKER(name, target) \
70 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \ 70 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target)
71 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
72 INTERNAL_GR_CREATE_TRACE_MARKER(SK_MACRO_APPEND_LINE(static_name), \
73 SK_MACRO_APPEND_LINE(name_counter), \
74 target) \
75 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter)); \
76 71
77 #define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target) \ 72 #define GR_CREATE_TRACE_MARKER1(name, target, arg1_name, arg1_val) \
78 GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ 73 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, arg1_name, arg1_val)
79 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \
80 "id", name_counter) \
81 74
82 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ 75 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, ...) \
83 GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \ 76 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \
84 if (target->isGpuTracingEnabled()) { \ 77 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
85 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \ 78 INTERNAL_GR_CREATE_TRACE_MARKER(SK_MACRO_APPEND_LINE(static_name), \
86 } \ 79 SK_MACRO_APPEND_LINE(name_counter), \
80 target, ##__VA_ARGS__) \
81 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter));
87 82
88 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context) \ 83 #define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target, ...) \
89 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \ 84 GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \
90 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \ 85 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \
91 INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name), \ 86 "id", name_counter, ##__VA_ARGS__);
92 SK_MACRO_APPEND_LINE(name_counter), \
93 context) \
94 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter)); \
95 87
96 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context) \ 88 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \
97 GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \ 89 GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \
98 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \ 90 if (target->isGpuTracingEnabled()) { \
99 "id", name_counter) \ 91 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
100 92 }
101 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
102 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \
103 if (context->isGpuTracingEnabled()) { \
104 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
105 } \
106 93
107 94
95
96 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context) \
97 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context)
98
99 #define GR_CREATE_TRACE_MARKER_CONTEXT1(name, context, arg1_name, arg1_val) \
100 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, arg1_name, arg1_val)
101
102 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, ...) \
103 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \
104 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
105 INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name), \
106 SK_MACRO_APPEND_LINE(name_counter), \
107 context, ##__VA_ARGS__) \
108 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter));
109
110 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...) \
111 GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
112 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \
113 "id", name_counter, ##__VA_ARGS__);
114
115 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
116 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \
117 if (context->isGpuTracingEnabled()) { \
118 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
119 }
120
108 #endif 121 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698