aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2016-01-11 10:39:11 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-11 10:39:11 -0800
commit5651ee6376dc3271ea8f4fc91b037c8f361c3cfa (patch)
tree6a7b2737f6d76cf057bec66a84c4a673e7194b1f /include/gpu
parentcc16c598d7f3411985378abe4bc94764eb1f8ec3 (diff)
Change to wire up opnames in SkGpuDevice
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/GrConfig.h7
-rw-r--r--include/gpu/GrContext.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index 26667b1c7e..04c3857d09 100644
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -185,4 +185,11 @@ typedef unsigned __int64 uint64_t;
#endif
#endif
+/**
+ * Enable batch debugging output as json
+ * TODO make this runtime configurable
+ */
+#if !defined(GR_BATCH_DEBUGGING_OUTPUT)
+ #define GR_BATCH_DEBUGGING_OUTPUT 0
+#endif
#endif
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 54db1953d5..de7644465a 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -359,7 +359,7 @@ public:
/** Get pointer to atlas texture for given mask format */
GrTexture* getFontAtlasTexture(GrMaskFormat format);
- SkString dumpAuditTrailToJson() const { return fAuditTrail.toJson(); }
+ GrAuditTrail* getAuditTrail() { return &fAuditTrail; }
private:
GrGpu* fGpu;