Guard GrOp::dumpInfo with SK_DEBUG
This code was only called from debug code, but was still showing up in
Flutter's release build.
Bug: skia:
Change-Id: I0cba323fc3cb14cfe6daf2388cecf5cf317ac9fa
Reviewed-on: https://skia-review.googlesource.com/c/170268
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index b897a1a..fc1dfeb 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -770,6 +770,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Count: %d\n", fPaths.count());
@@ -777,6 +778,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index c899465..3a7cc05 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -211,6 +211,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
str.append(INHERITED::dumpInfo());
@@ -227,6 +228,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 0c77462..610bce1 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -826,6 +826,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor.toBytes_RGBA(),
@@ -834,6 +835,7 @@
string += fHelper.dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index ac6cb61..74a9bc0 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -180,6 +180,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (const auto& path : fPaths) {
@@ -193,6 +194,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index b69eda7..f2be50a 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -187,6 +187,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (const auto& info : fRects) {
@@ -204,6 +205,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index bc1b6d0..d2aa33e 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -117,6 +117,7 @@
fProcessors.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString GrAtlasTextOp::dumpInfo() const {
SkString str;
@@ -133,6 +134,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
GrDrawOp::FixedFunctionFlags GrAtlasTextOp::fixedFunctionFlags() const {
return FixedFunctionFlags::kNone;
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 22bdc5e..7386321 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -70,7 +70,9 @@
void visitProxies(const VisitProxyFunc& func, VisitorType) const override;
+#ifdef SK_DEBUG
SkString dumpInfo() const override;
+#endif
FixedFunctionFlags fixedFunctionFlags() const override;
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index c123e58..8ad0baa 100644
--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@@ -29,6 +29,7 @@
const char* name() const override { return "Clear"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.append(INHERITED::dumpInfo());
@@ -42,6 +43,7 @@
string.appendf("], Color: 0x%08x\n", fColor.toBytes_RGBA());
return string;
}
+#endif
const SkPMColor4f& color() const { return fColor; }
void setColor(const SkPMColor4f& color) { fColor = color; }
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index 5861fca..28e9207 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -25,6 +25,7 @@
const char* name() const override { return "ClearStencilClip"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string("Scissor [");
if (fClip.scissorEnabled()) {
@@ -37,6 +38,7 @@
string.append(INHERITED::dumpInfo());
return string;
}
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrCopySurfaceOp.h b/src/gpu/ops/GrCopySurfaceOp.h
index c0760ec..54eec74 100644
--- a/src/gpu/ops/GrCopySurfaceOp.h
+++ b/src/gpu/ops/GrCopySurfaceOp.h
@@ -25,6 +25,7 @@
void visitProxies(const VisitProxyFunc& func, VisitorType) const override { func(fSrc.get()); }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.append(INHERITED::dumpInfo());
@@ -35,6 +36,7 @@
fDstPoint.fX, fDstPoint.fY);
return string;
}
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 2ecde76..220f49b 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -283,6 +283,7 @@
fProcessorSet.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (const auto& geo : fLines) {
@@ -299,6 +300,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override {
FixedFunctionFlags flags = FixedFunctionFlags::kNone;
diff --git a/src/gpu/ops/GrDebugMarkerOp.h b/src/gpu/ops/GrDebugMarkerOp.h
index 96c5477..c2e9582 100644
--- a/src/gpu/ops/GrDebugMarkerOp.h
+++ b/src/gpu/ops/GrDebugMarkerOp.h
@@ -23,11 +23,13 @@
const char* name() const override { return "DebugMarker"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.append(INHERITED::dumpInfo());
return string;
}
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index c2e1d69..3e70847 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -361,6 +361,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Color: 0x%08x Count: %d\n", fColor.toBytes_RGBA(), fPaths.count());
@@ -371,6 +372,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
DefaultPathOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color, const SkPath& path,
SkScalar tolerance, uint8_t coverage, const SkMatrix& viewMatrix, bool isHairline,
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index e34df8d..c242bfe 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -109,6 +109,7 @@
this->setTransformedBounds(bounds, viewMatrix, HasAABloat::kNo, IsZeroArea::kNo);
}
+#ifdef SK_DEBUG
SkString GrDrawAtlasOp::dumpInfo() const {
SkString string;
for (const auto& geo : fGeoData) {
@@ -119,6 +120,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
void GrDrawAtlasOp::onPrepareDraws(Target* target) {
// Setup geometry processor
diff --git a/src/gpu/ops/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index 16d0520..9a5576a 100644
--- a/src/gpu/ops/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
@@ -42,7 +42,9 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override;
+#endif
FixedFunctionFlags fixedFunctionFlags() const override;
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index c1004b6..aa0479a 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -21,12 +21,14 @@
, fAAType(aaType)
, fProcessorSet(std::move(paint)) {}
+#ifdef SK_DEBUG
SkString GrDrawPathOp::dumpInfo() const {
SkString string;
string.printf("PATH: 0x%p", fPath.get());
string.append(INHERITED::dumpInfo());
return string;
}
+#endif
GrPipeline::InitArgs GrDrawPathOpBase::pipelineInitArgs(const GrOpFlushState& state) {
static constexpr GrUserStencilSettings kCoverPass{
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index 1441504..e9ca4e6 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -82,7 +82,9 @@
const char* name() const override { return "DrawPath"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override;
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 26372ce..ace2711 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -114,6 +114,7 @@
}
}
+#ifdef SK_DEBUG
SkString GrDrawVerticesOp::dumpInfo() const {
SkString string;
string.appendf("PrimType: %d, MeshCount %d, VCount: %d, ICount: %d\n", (int)fPrimitiveType,
@@ -122,6 +123,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
GrDrawOp::FixedFunctionFlags GrDrawVerticesOp::fixedFunctionFlags() const {
return fHelper.fixedFunctionFlags();
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index bab51ae..d160dee 100644
--- a/src/gpu/ops/GrDrawVerticesOp.h
+++ b/src/gpu/ops/GrDrawVerticesOp.h
@@ -55,7 +55,9 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override;
+#endif
FixedFunctionFlags fixedFunctionFlags() const override;
diff --git a/src/gpu/ops/GrDrawableOp.h b/src/gpu/ops/GrDrawableOp.h
index cb295b2..6115eca 100644
--- a/src/gpu/ops/GrDrawableOp.h
+++ b/src/gpu/ops/GrDrawableOp.h
@@ -24,9 +24,11 @@
const char* name() const override { return "Drawable"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
return INHERITED::dumpInfo();
}
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index bdfa895..c089c34 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -177,6 +177,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
@@ -190,6 +191,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index 743845f..c30621c 100644
--- a/src/gpu/ops/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
@@ -154,6 +154,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
str.append(GrMeshDrawOp::dumpInfo());
@@ -168,6 +169,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fRects.front().fColor;
@@ -284,6 +286,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
str.appendf("# combined: %d\n", fRects.count());
@@ -297,6 +300,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fRects.front().fColor;
diff --git a/src/gpu/ops/GrNonAAStrokeRectOp.cpp b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
index fef7f09..bd8b3e4 100644
--- a/src/gpu/ops/GrNonAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
@@ -67,6 +67,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf(
@@ -78,6 +79,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
static std::unique_ptr<GrDrawOp> Make(GrContext* context,
GrPaint&& paint,
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index e7dea06..efe740f 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -179,12 +179,16 @@
}
/** Used for spewing information about ops when debugging. */
+#ifdef SK_DEBUG
virtual SkString dumpInfo() const {
SkString string;
string.appendf("OpBounds: [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
fBounds.fLeft, fBounds.fTop, fBounds.fRight, fBounds.fBottom);
return string;
}
+#else
+ SkString dumpInfo() const { return SkString("<Op information unavailable>"); }
+#endif
/**
* A helper for iterating over an op chain in a range for loop that also downcasts to a GrOp
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 6d92795..e3ccbfc 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1142,6 +1142,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (int i = 0; i < fCircles.count(); ++i) {
@@ -1157,6 +1158,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fCircles.front().fColor;
@@ -1500,6 +1502,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (int i = 0; i < fCircles.count(); ++i) {
@@ -1517,6 +1520,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fCircles.front().fColor;
@@ -1818,6 +1822,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Stroked: %d\n", fStroked);
@@ -1833,6 +1838,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fEllipses.front().fColor;
@@ -2055,6 +2061,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (const auto& geo : fEllipses) {
@@ -2070,6 +2077,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fEllipses.front().fColor;
@@ -2389,6 +2397,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (int i = 0; i < fRRects.count(); ++i) {
@@ -2404,6 +2413,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fRRects.front().fColor;
@@ -2754,6 +2764,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Stroked: %d\n", fStroked);
@@ -2769,6 +2780,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkPMColor4f* color = &fRRects.front().fColor;
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index 34fa6a9..a7040bf 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -90,6 +90,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
str.appendf("# combined: %d\n", fRegions.count());
@@ -102,6 +103,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index 52816cc..180d47e 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -236,6 +236,7 @@
const char* name() const override { return "ShadowCircularRRectOp"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (int i = 0; i < fGeoData.count(); ++i) {
@@ -250,6 +251,7 @@
string.append(INHERITED::dumpInfo());
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index 32e4246..928c4ff 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -101,6 +101,7 @@
return result;
}
+#ifdef SK_DEBUG
SkString GrSimpleMeshDrawOpHelper::dumpInfo() const {
const GrProcessorSet& processors = fProcessors ? *fProcessors : GrProcessorSet::EmptySet();
SkString result = processors.dumpProcessors();
@@ -122,6 +123,7 @@
result.append(GrPipeline::DumpFlags(fPipelineFlags));
return result;
}
+#endif
GrPipeline::InitArgs GrSimpleMeshDrawOpHelper::pipelineInitArgs(
GrMeshDrawOp::Target* target) const {
@@ -189,8 +191,10 @@
return this->internalMakePipeline(target, args, numPrimitiveProcessorTextures);
}
+#ifdef SK_DEBUG
SkString GrSimpleMeshDrawOpHelperWithStencil::dumpInfo() const {
SkString result = INHERITED::dumpInfo();
result.appendf("Stencil settings: %s\n", (fStencilSettings ? "yes" : "no"));
return result;
}
+#endif
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index adecc9e..b11b7d3 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -109,7 +109,9 @@
}
}
+#ifdef SK_DEBUG
SkString dumpInfo() const;
+#endif
GrAAType aaType() const { return static_cast<GrAAType>(fAAType); }
protected:
@@ -168,7 +170,9 @@
PipelineAndFixedDynamicState makePipeline(GrMeshDrawOp::Target*,
int numPrimitiveProcessorTextures = 0);
+#ifdef SK_DEBUG
SkString dumpInfo() const;
+#endif
GrAAType aaType() const { return INHERITED::aaType(); }
private:
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 4f6057e..cee4b75 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -281,6 +281,7 @@
}
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
for (const auto& geo : fShapes) {
@@ -290,6 +291,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index edfcaa8..1e912c3 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -30,12 +30,14 @@
const char* name() const override { return "StencilPathOp"; }
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.printf("Path: 0x%p, AA: %d", fPath.get(), fUseHWAA);
string.append(INHERITED::dumpInfo());
return string;
}
+#endif
private:
friend class GrOpMemoryPool; // for ctor
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index 4f343c6..342b870 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -188,6 +188,7 @@
fHelper.visitProxies(func);
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString string;
string.appendf("Color 0x%08x, aa: %d\n", fColor.toBytes_RGBA(), fAntiAlias);
@@ -195,6 +196,7 @@
string += INHERITED::dumpInfo();
return string;
}
+#endif
TessellatingPathOp(Helper::MakeArgs helperArgs,
const SkPMColor4f& color,
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 0bf4d27..a013d94 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -263,6 +263,7 @@
}
}
+#ifdef SK_DEBUG
SkString dumpInfo() const override {
SkString str;
str.appendf("# draws: %d\n", fQuads.count());
@@ -285,6 +286,7 @@
str += INHERITED::dumpInfo();
return str;
}
+#endif
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkASSERT(!fFinalized);