Reland "Guard dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG."

and "Guard gencode dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG" and "Remove dumpInfo() entirely when GR_TEST_UTILS is off." This is a reland of 26900788ef and b5e8a2533a and d7b09c4c3a and unit tests are now fixed. Original change's description: > Guard dumpInfo() calls with GR_TEST_UTILS, instead of SK_DEBUG. > > (One exception: the `dumpInfo` in GrVkCommandPool is wrapped with > SK_TRACE_MANAGED_RESOURCES to match its peers in GrVkManagedResource.) > > Change-Id: I6cf55fa2bb5687f79a2cc0c2a9c02a629bfd4f8e > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309556 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> Change-Id: I16e6606082a814b4fa5ef58d1096fc915f5ac704 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309721 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-08-12 15:07:45 -04:00 · 2020-08-12 15:07:45 -04:00 · 8d9bf6467b
commit 8d9bf6467b
parent e12939f0d8
105 changed files with 155 additions and 130 deletions
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@ -75,7 +75,7 @@ const GrTextureEffect* GrFragmentProcessor::asTextureEffect() const {
    return nullptr;
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 static void recursive_dump_tree_info(const GrFragmentProcessor& fp,
                                     SkString indent,
                                     SkString* text) {
--- a/src/gpu/GrFragmentProcessor.h
+++ b/src/gpu/GrFragmentProcessor.h
@ -250,12 +250,10 @@ public:
    GrTextureEffect* asTextureEffect();
    const GrTextureEffect* asTextureEffect() const;

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    // Generates debug info for this processor tree by recursively calling dumpInfo() on this
    // processor and its children.
    SkString dumpTreeInfo() const;
-#else
-    SkString dumpTreeInfo() const { return dumpInfo(); }
 #endif

    // A pre-order traversal iterator over a hierarchy of FPs. It can also iterate over all the FP
--- a/src/gpu/GrProcessor.h
+++ b/src/gpu/GrProcessor.h
@ -184,12 +184,10 @@ public:
    virtual const char* name() const = 0;

    /** Human-readable dump of all information */
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    virtual SkString dumpInfo() const {
        return SkString(name());
    }
-#else
-    SkString dumpInfo() const { return SkString("<Processor information unavailable>"); }
 #endif

    /**
--- a/src/gpu/GrProcessorSet.cpp
+++ b/src/gpu/GrProcessorSet.cpp
@ -49,7 +49,7 @@ GrProcessorSet::~GrProcessorSet() {
    }
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrProcessorSet::dumpProcessors() const {
    SkString result;
    if (this->hasColorFragmentProcessor()) {
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@ -143,7 +143,7 @@ public:
    static GrProcessorSet MakeEmptySet();
    static constexpr Analysis EmptySetAnalysis() { return Analysis(Empty::kEmpty); }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpProcessors() const;
 #endif

--- a/src/gpu/effects/GrBlendFragmentProcessor.cpp
+++ b/src/gpu/effects/GrBlendFragmentProcessor.cpp
@ -51,7 +51,7 @@ public:

    const char* name() const override { return "Blend"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        return SkStringPrintf("BlendFragmentProcessor(fMode=%s)", SkBlendMode_Name(fMode));
    }
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
@ -40,7 +40,7 @@ public:

    const char* name() const override { return "GaussianConvolution"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        return SkStringPrintf("GaussianConvolutionFragmentProcessor(dir=%s, radius=%d)",
                              Direction::kX == fDirection ? "X" : "Y", fRadius);
--- a/src/gpu/effects/GrYUVtoRGBEffect.cpp
+++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp
@ -183,7 +183,7 @@ GrYUVtoRGBEffect::GrYUVtoRGBEffect(std::unique_ptr<GrFragmentProcessor> planeFPs
    }
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrYUVtoRGBEffect::dumpInfo() const {
    SkString str("YUVtoRGBEffect(");
    for (int i = 0; i < 4; ++i) {
--- a/src/gpu/effects/GrYUVtoRGBEffect.h
+++ b/src/gpu/effects/GrYUVtoRGBEffect.h
@ -23,7 +23,7 @@ public:
                                                     const SkMatrix& localMatrix = SkMatrix::I(),
                                                     const SkRect* subset = nullptr,
                                                     const SkRect* domain = nullptr);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif

--- a/src/gpu/effects/generated/GrAARectEffect.cpp
+++ b/src/gpu/effects/generated/GrAARectEffect.cpp
@ -110,7 +110,7 @@ GrAARectEffect::GrAARectEffect(const GrAARectEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrAARectEffect::clone() const {
    return std::make_unique<GrAARectEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrAARectEffect::dumpInfo() const {
    return SkStringPrintf("AARectEffect(edgeType=%d, rect=float4(%f, %f, %f, %f))", (int)edgeType,
                          rect.left(), rect.top(), rect.right(), rect.bottom());
--- a/src/gpu/effects/generated/GrAARectEffect.h
+++ b/src/gpu/effects/generated/GrAARectEffect.h
@ -25,7 +25,7 @@ public:
                new GrAARectEffect(std::move(inputFP), edgeType, rect));
    }
    GrAARectEffect(const GrAARectEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
@ -96,7 +96,7 @@ GrAlphaThresholdFragmentProcessor::GrAlphaThresholdFragmentProcessor(
 std::unique_ptr<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::clone() const {
    return std::make_unique<GrAlphaThresholdFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrAlphaThresholdFragmentProcessor::dumpInfo() const {
    return SkStringPrintf("AlphaThresholdFragmentProcessor(innerThreshold=%f, outerThreshold=%f)",
                          innerThreshold, outerThreshold);
--- a/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h
@ -26,7 +26,7 @@ public:
                std::move(inputFP), std::move(maskFP), innerThreshold, outerThreshold));
    }
    GrAlphaThresholdFragmentProcessor(const GrAlphaThresholdFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrArithmeticProcessor.cpp
+++ b/src/gpu/effects/generated/GrArithmeticProcessor.cpp
@ -81,7 +81,7 @@ GrArithmeticProcessor::GrArithmeticProcessor(const GrArithmeticProcessor& src)
 std::unique_ptr<GrFragmentProcessor> GrArithmeticProcessor::clone() const {
    return std::make_unique<GrArithmeticProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrArithmeticProcessor::dumpInfo() const {
    return SkStringPrintf("ArithmeticProcessor(k=float4(%f, %f, %f, %f), enforcePMColor=%s)", k.x,
                          k.y, k.z, k.w, (enforcePMColor ? "true" : "false"));
--- a/src/gpu/effects/generated/GrArithmeticProcessor.h
+++ b/src/gpu/effects/generated/GrArithmeticProcessor.h
@ -29,7 +29,7 @@ public:
                inputs.fEnforcePMColor));
    }
    GrArithmeticProcessor(const GrArithmeticProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
@ -70,7 +70,7 @@ GrBlurredEdgeFragmentProcessor::GrBlurredEdgeFragmentProcessor(
 std::unique_ptr<GrFragmentProcessor> GrBlurredEdgeFragmentProcessor::clone() const {
    return std::make_unique<GrBlurredEdgeFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrBlurredEdgeFragmentProcessor::dumpInfo() const {
    return SkStringPrintf("BlurredEdgeFragmentProcessor(mode=%d)", (int)mode);
 }
--- a/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
@ -25,7 +25,7 @@ public:
                new GrBlurredEdgeFragmentProcessor(std::move(inputFP), mode));
    }
    GrBlurredEdgeFragmentProcessor(const GrBlurredEdgeFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
@ -360,7 +360,7 @@ GrCircleBlurFragmentProcessor::GrCircleBlurFragmentProcessor(
 std::unique_ptr<GrFragmentProcessor> GrCircleBlurFragmentProcessor::clone() const {
    return std::make_unique<GrCircleBlurFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrCircleBlurFragmentProcessor::dumpInfo() const {
    return SkStringPrintf(
            "CircleBlurFragmentProcessor(circleRect=half4(%f, %f, %f, %f), solidRadius=%f, "
--- a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h
@ -25,7 +25,7 @@ public:
                                                     const SkRect& circle,
                                                     float sigma);
    GrCircleBlurFragmentProcessor(const GrCircleBlurFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrCircleEffect.cpp
+++ b/src/gpu/effects/generated/GrCircleEffect.cpp
@ -121,7 +121,7 @@ GrCircleEffect::GrCircleEffect(const GrCircleEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrCircleEffect::clone() const {
    return std::make_unique<GrCircleEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrCircleEffect::dumpInfo() const {
    return SkStringPrintf("CircleEffect(edgeType=%d, center=float2(%f, %f), radius=%f)",
                          (int)edgeType, center.fX, center.fY, radius);
--- a/src/gpu/effects/generated/GrCircleEffect.h
+++ b/src/gpu/effects/generated/GrCircleEffect.h
@ -31,7 +31,7 @@ public:
                new GrCircleEffect(std::move(inputFP), edgeType, center, radius)));
    }
    GrCircleEffect(const GrCircleEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrClampFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrClampFragmentProcessor.cpp
@ -65,7 +65,7 @@ GrClampFragmentProcessor::GrClampFragmentProcessor(const GrClampFragmentProcesso
 std::unique_ptr<GrFragmentProcessor> GrClampFragmentProcessor::clone() const {
    return std::make_unique<GrClampFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrClampFragmentProcessor::dumpInfo() const {
    return SkStringPrintf("ClampFragmentProcessor(clampToPremul=%s)",
                          (clampToPremul ? "true" : "false"));
--- a/src/gpu/effects/generated/GrClampFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrClampFragmentProcessor.h
@ -31,7 +31,7 @@ public:
                new GrClampFragmentProcessor(std::move(inputFP), clampToPremul));
    }
    GrClampFragmentProcessor(const GrClampFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp
@ -123,7 +123,7 @@ GrColorMatrixFragmentProcessor::GrColorMatrixFragmentProcessor(
 std::unique_ptr<GrFragmentProcessor> GrColorMatrixFragmentProcessor::clone() const {
    return std::make_unique<GrColorMatrixFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrColorMatrixFragmentProcessor::dumpInfo() const {
    return SkStringPrintf(
            "ColorMatrixFragmentProcessor(m=half4x4(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, "
--- a/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h
@ -57,7 +57,7 @@ public:
                std::move(inputFP), m44, v4, unpremulInput, clampRGBOutput, premulOutput));
    }
    GrColorMatrixFragmentProcessor(const GrColorMatrixFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrComposeLerpEffect.cpp
+++ b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
@ -63,7 +63,7 @@ GrComposeLerpEffect::GrComposeLerpEffect(const GrComposeLerpEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrComposeLerpEffect::clone() const {
    return std::make_unique<GrComposeLerpEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrComposeLerpEffect::dumpInfo() const {
    return SkStringPrintf("ComposeLerpEffect(weight=%f)", weight);
 }
--- a/src/gpu/effects/generated/GrComposeLerpEffect.h
+++ b/src/gpu/effects/generated/GrComposeLerpEffect.h
@ -25,7 +25,7 @@ public:
                new GrComposeLerpEffect(std::move(child1), std::move(child2), weight));
    }
    GrComposeLerpEffect(const GrComposeLerpEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
@ -70,7 +70,7 @@ GrConfigConversionEffect::GrConfigConversionEffect(const GrConfigConversionEffec
 std::unique_ptr<GrFragmentProcessor> GrConfigConversionEffect::clone() const {
    return std::make_unique<GrConfigConversionEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrConfigConversionEffect::dumpInfo() const {
    return SkStringPrintf("ConfigConversionEffect(pmConversion=%d)", (int)pmConversion);
 }
--- a/src/gpu/effects/generated/GrConfigConversionEffect.h
+++ b/src/gpu/effects/generated/GrConfigConversionEffect.h
@ -35,7 +35,7 @@ public:
                new GrConfigConversionEffect(std::move(fp), pmConversion));
    }
    GrConfigConversionEffect(const GrConfigConversionEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrConstColorProcessor.cpp
+++ b/src/gpu/effects/generated/GrConstColorProcessor.cpp
@ -67,7 +67,7 @@ GrConstColorProcessor::GrConstColorProcessor(const GrConstColorProcessor& src)
 std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::clone() const {
    return std::make_unique<GrConstColorProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrConstColorProcessor::dumpInfo() const {
    return SkStringPrintf("ConstColorProcessor(color=half4(%f, %f, %f, %f))", color.fR, color.fG,
                          color.fB, color.fA);
--- a/src/gpu/effects/generated/GrConstColorProcessor.h
+++ b/src/gpu/effects/generated/GrConstColorProcessor.h
@ -25,7 +25,7 @@ public:
        return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color));
    }
    GrConstColorProcessor(const GrConstColorProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
+++ b/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
@ -53,7 +53,7 @@ GrDeviceSpaceEffect::GrDeviceSpaceEffect(const GrDeviceSpaceEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrDeviceSpaceEffect::clone() const {
    return std::make_unique<GrDeviceSpaceEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrDeviceSpaceEffect::dumpInfo() const { return SkStringPrintf("DeviceSpaceEffect"); }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDeviceSpaceEffect);
--- a/src/gpu/effects/generated/GrDeviceSpaceEffect.h
+++ b/src/gpu/effects/generated/GrDeviceSpaceEffect.h
@ -26,7 +26,7 @@ public:
        return std::unique_ptr<GrFragmentProcessor>(new GrDeviceSpaceEffect(std::move(fp)));
    }
    GrDeviceSpaceEffect(const GrDeviceSpaceEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrDitherEffect.cpp
+++ b/src/gpu/effects/generated/GrDitherEffect.cpp
@ -75,7 +75,7 @@ GrDitherEffect::GrDitherEffect(const GrDitherEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrDitherEffect::clone() const {
    return std::make_unique<GrDitherEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrDitherEffect::dumpInfo() const {
    return SkStringPrintf("DitherEffect(range=%f)", range);
 }
--- a/src/gpu/effects/generated/GrDitherEffect.h
+++ b/src/gpu/effects/generated/GrDitherEffect.h
@ -26,7 +26,7 @@ public:
        return std::unique_ptr<GrFragmentProcessor>(new GrDitherEffect(std::move(inputFP), range));
    }
    GrDitherEffect(const GrDitherEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrEllipseEffect.cpp
+++ b/src/gpu/effects/generated/GrEllipseEffect.cpp
@ -161,7 +161,7 @@ GrEllipseEffect::GrEllipseEffect(const GrEllipseEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrEllipseEffect::clone() const {
    return std::make_unique<GrEllipseEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrEllipseEffect::dumpInfo() const {
    return SkStringPrintf("EllipseEffect(edgeType=%d, center=float2(%f, %f), radii=float2(%f, %f))",
                          (int)edgeType, center.fX, center.fY, radii.fX, radii.fY);
--- a/src/gpu/effects/generated/GrEllipseEffect.h
+++ b/src/gpu/effects/generated/GrEllipseEffect.h
@ -41,7 +41,7 @@ public:
                new GrEllipseEffect(std::move(inputFP), edgeType, center, radii)));
    }
    GrEllipseEffect(const GrEllipseEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp
@ -59,6 +59,6 @@ GrHSLToRGBFilterEffect::GrHSLToRGBFilterEffect(const GrHSLToRGBFilterEffect& src
 std::unique_ptr<GrFragmentProcessor> GrHSLToRGBFilterEffect::clone() const {
    return std::make_unique<GrHSLToRGBFilterEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrHSLToRGBFilterEffect::dumpInfo() const { return SkStringPrintf("HSLToRGBFilterEffect"); }
 #endif
--- a/src/gpu/effects/generated/GrHSLToRGBFilterEffect.h
+++ b/src/gpu/effects/generated/GrHSLToRGBFilterEffect.h
@ -36,7 +36,7 @@ public:
        return std::unique_ptr<GrFragmentProcessor>(new GrHSLToRGBFilterEffect(std::move(inputFP)));
    }
    GrHSLToRGBFilterEffect(const GrHSLToRGBFilterEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp
@ -163,7 +163,7 @@ GrHighContrastFilterEffect::GrHighContrastFilterEffect(const GrHighContrastFilte
 std::unique_ptr<GrFragmentProcessor> GrHighContrastFilterEffect::clone() const {
    return std::make_unique<GrHighContrastFilterEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrHighContrastFilterEffect::dumpInfo() const {
    return SkStringPrintf(
            "HighContrastFilterEffect(contrastMod=%f, hasContrast=%s, grayscale=%s, "
--- a/src/gpu/effects/generated/GrHighContrastFilterEffect.h
+++ b/src/gpu/effects/generated/GrHighContrastFilterEffect.h
@ -35,7 +35,7 @@ public:
                linearize));
    }
    GrHighContrastFilterEffect(const GrHighContrastFilterEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
@ -55,7 +55,7 @@ GrLumaColorFilterEffect::GrLumaColorFilterEffect(const GrLumaColorFilterEffect&
 std::unique_ptr<GrFragmentProcessor> GrLumaColorFilterEffect::clone() const {
    return std::make_unique<GrLumaColorFilterEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrLumaColorFilterEffect::dumpInfo() const {
    return SkStringPrintf("LumaColorFilterEffect");
 }
--- a/src/gpu/effects/generated/GrLumaColorFilterEffect.h
+++ b/src/gpu/effects/generated/GrLumaColorFilterEffect.h
@ -31,7 +31,7 @@ public:
                new GrLumaColorFilterEffect(std::move(inputFP)));
    }
    GrLumaColorFilterEffect(const GrLumaColorFilterEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrMagnifierEffect.cpp
+++ b/src/gpu/effects/generated/GrMagnifierEffect.cpp
@ -147,7 +147,7 @@ GrMagnifierEffect::GrMagnifierEffect(const GrMagnifierEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrMagnifierEffect::clone() const {
    return std::make_unique<GrMagnifierEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrMagnifierEffect::dumpInfo() const {
    return SkStringPrintf(
            "MagnifierEffect(bounds=int4(%d, %d, %d, %d), srcRect=float4(%f, %f, %f, %f), "
--- a/src/gpu/effects/generated/GrMagnifierEffect.h
+++ b/src/gpu/effects/generated/GrMagnifierEffect.h
@ -29,7 +29,7 @@ public:
                std::move(src), bounds, srcRect, xInvZoom, yInvZoom, xInvInset, yInvInset));
    }
    GrMagnifierEffect(const GrMagnifierEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrMixerEffect.cpp
+++ b/src/gpu/effects/generated/GrMixerEffect.cpp
@ -69,7 +69,7 @@ GrMixerEffect::GrMixerEffect(const GrMixerEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrMixerEffect::clone() const {
    return std::make_unique<GrMixerEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrMixerEffect::dumpInfo() const {
    return SkStringPrintf("MixerEffect(weight=%f)", weight);
 }
--- a/src/gpu/effects/generated/GrMixerEffect.h
+++ b/src/gpu/effects/generated/GrMixerEffect.h
@ -33,7 +33,7 @@ public:
                new GrMixerEffect(std::move(inputFP), std::move(fp0), std::move(fp1), weight));
    }
    GrMixerEffect(const GrMixerEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
@ -103,7 +103,7 @@ GrOverrideInputFragmentProcessor::GrOverrideInputFragmentProcessor(
 std::unique_ptr<GrFragmentProcessor> GrOverrideInputFragmentProcessor::clone() const {
    return std::make_unique<GrOverrideInputFragmentProcessor>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrOverrideInputFragmentProcessor::dumpInfo() const {
    return SkStringPrintf(
            "OverrideInputFragmentProcessor(useUniform=%s, uniformColor=half4(%f, %f, %f, %f), "
--- a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h
+++ b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h
@ -42,7 +42,7 @@ public:
                new GrOverrideInputFragmentProcessor(std::move(fp), useUniform, color, color));
    }
    GrOverrideInputFragmentProcessor(const GrOverrideInputFragmentProcessor& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp
@ -62,6 +62,6 @@ GrRGBToHSLFilterEffect::GrRGBToHSLFilterEffect(const GrRGBToHSLFilterEffect& src
 std::unique_ptr<GrFragmentProcessor> GrRGBToHSLFilterEffect::clone() const {
    return std::make_unique<GrRGBToHSLFilterEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrRGBToHSLFilterEffect::dumpInfo() const { return SkStringPrintf("RGBToHSLFilterEffect"); }
 #endif
--- a/src/gpu/effects/generated/GrRGBToHSLFilterEffect.h
+++ b/src/gpu/effects/generated/GrRGBToHSLFilterEffect.h
@ -38,7 +38,7 @@ public:
        return std::unique_ptr<GrFragmentProcessor>(new GrRGBToHSLFilterEffect(std::move(inputFP)));
    }
    GrRGBToHSLFilterEffect(const GrRGBToHSLFilterEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrRRectBlurEffect.cpp
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.cpp
@ -159,7 +159,7 @@ GrRRectBlurEffect::GrRRectBlurEffect(const GrRRectBlurEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrRRectBlurEffect::clone() const {
    return std::make_unique<GrRRectBlurEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrRRectBlurEffect::dumpInfo() const {
    return SkStringPrintf("RRectBlurEffect(sigma=%f, rect=float4(%f, %f, %f, %f), cornerRadius=%f)",
                          sigma, rect.left(), rect.top(), rect.right(), rect.bottom(),
--- a/src/gpu/effects/generated/GrRRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.h
@ -115,7 +115,7 @@ public:
                                                     const SkRRect& srcRRect,
                                                     const SkRRect& devRRect);
    GrRRectBlurEffect(const GrRRectBlurEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/effects/generated/GrRectBlurEffect.cpp
+++ b/src/gpu/effects/generated/GrRectBlurEffect.cpp
@ -152,7 +152,7 @@ GrRectBlurEffect::GrRectBlurEffect(const GrRectBlurEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrRectBlurEffect::clone() const {
    return std::make_unique<GrRectBlurEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrRectBlurEffect::dumpInfo() const {
    return SkStringPrintf("RectBlurEffect(rect=float4(%f, %f, %f, %f), isFast=%s)", rect.left(),
                          rect.top(), rect.right(), rect.bottom(), (isFast ? "true" : "false"));
--- a/src/gpu/effects/generated/GrRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRectBlurEffect.h
@ -123,7 +123,7 @@ public:
                                     GrSamplerState::Filter::kLinear));
    }
    GrRectBlurEffect(const GrRectBlurEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
+++ b/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
@ -114,7 +114,7 @@ GrClampedGradientEffect::GrClampedGradientEffect(const GrClampedGradientEffect&
 std::unique_ptr<GrFragmentProcessor> GrClampedGradientEffect::clone() const {
    return std::make_unique<GrClampedGradientEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrClampedGradientEffect::dumpInfo() const {
    return SkStringPrintf(
            "ClampedGradientEffect(leftBorderColor=half4(%f, %f, %f, %f), "
--- a/src/gpu/gradients/generated/GrClampedGradientEffect.h
+++ b/src/gpu/gradients/generated/GrClampedGradientEffect.h
@ -30,7 +30,7 @@ public:
                makePremul, colorsAreOpaque));
    }
    GrClampedGradientEffect(const GrClampedGradientEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp
+++ b/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp
@ -137,7 +137,7 @@ GrDualIntervalGradientColorizer::GrDualIntervalGradientColorizer(
 std::unique_ptr<GrFragmentProcessor> GrDualIntervalGradientColorizer::clone() const {
    return std::make_unique<GrDualIntervalGradientColorizer>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrDualIntervalGradientColorizer::dumpInfo() const {
    return SkStringPrintf(
            "DualIntervalGradientColorizer(scale01=float4(%f, %f, %f, %f), bias01=float4(%f, %f, "
--- a/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h
+++ b/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h
@ -24,7 +24,7 @@ public:
                                                     const SkPMColor4f& c3,
                                                     float threshold);
    GrDualIntervalGradientColorizer(const GrDualIntervalGradientColorizer& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrLinearGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrLinearGradientLayout.cpp
@ -53,7 +53,7 @@ GrLinearGradientLayout::GrLinearGradientLayout(const GrLinearGradientLayout& src
 std::unique_ptr<GrFragmentProcessor> GrLinearGradientLayout::clone() const {
    return std::make_unique<GrLinearGradientLayout>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrLinearGradientLayout::dumpInfo() const { return SkStringPrintf("LinearGradientLayout"); }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrLinearGradientLayout);
--- a/src/gpu/gradients/generated/GrLinearGradientLayout.h
+++ b/src/gpu/gradients/generated/GrLinearGradientLayout.h
@ -25,7 +25,7 @@ public:
    static std::unique_ptr<GrFragmentProcessor> Make(const SkLinearGradient& gradient,
                                                     const GrFPArgs& args);
    GrLinearGradientLayout(const GrLinearGradientLayout& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
@ -53,7 +53,7 @@ GrRadialGradientLayout::GrRadialGradientLayout(const GrRadialGradientLayout& src
 std::unique_ptr<GrFragmentProcessor> GrRadialGradientLayout::clone() const {
    return std::make_unique<GrRadialGradientLayout>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrRadialGradientLayout::dumpInfo() const { return SkStringPrintf("RadialGradientLayout"); }
 #endif
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRadialGradientLayout);
--- a/src/gpu/gradients/generated/GrRadialGradientLayout.h
+++ b/src/gpu/gradients/generated/GrRadialGradientLayout.h
@ -25,7 +25,7 @@ public:
    static std::unique_ptr<GrFragmentProcessor> Make(const SkRadialGradient& gradient,
                                                     const GrFPArgs& args);
    GrRadialGradientLayout(const GrRadialGradientLayout& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp
+++ b/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp
@ -88,7 +88,7 @@ GrSingleIntervalGradientColorizer::GrSingleIntervalGradientColorizer(
 std::unique_ptr<GrFragmentProcessor> GrSingleIntervalGradientColorizer::clone() const {
    return std::make_unique<GrSingleIntervalGradientColorizer>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrSingleIntervalGradientColorizer::dumpInfo() const {
    return SkStringPrintf(
            "SingleIntervalGradientColorizer(start=half4(%f, %f, %f, %f), end=half4(%f, %f, %f, "
--- a/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h
+++ b/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h
@ -23,7 +23,7 @@ public:
                new GrSingleIntervalGradientColorizer(start, end));
    }
    GrSingleIntervalGradientColorizer(const GrSingleIntervalGradientColorizer& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
@ -91,7 +91,7 @@ GrSweepGradientLayout::GrSweepGradientLayout(const GrSweepGradientLayout& src)
 std::unique_ptr<GrFragmentProcessor> GrSweepGradientLayout::clone() const {
    return std::make_unique<GrSweepGradientLayout>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrSweepGradientLayout::dumpInfo() const {
    return SkStringPrintf("SweepGradientLayout(bias=%f, scale=%f)", bias, scale);
 }
--- a/src/gpu/gradients/generated/GrSweepGradientLayout.h
+++ b/src/gpu/gradients/generated/GrSweepGradientLayout.h
@ -25,7 +25,7 @@ public:
    static std::unique_ptr<GrFragmentProcessor> Make(const SkSweepGradient& gradient,
                                                     const GrFPArgs& args);
    GrSweepGradientLayout(const GrSweepGradientLayout& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrTiledGradientEffect.cpp
+++ b/src/gpu/gradients/generated/GrTiledGradientEffect.cpp
@ -93,7 +93,7 @@ GrTiledGradientEffect::GrTiledGradientEffect(const GrTiledGradientEffect& src)
 std::unique_ptr<GrFragmentProcessor> GrTiledGradientEffect::clone() const {
    return std::make_unique<GrTiledGradientEffect>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrTiledGradientEffect::dumpInfo() const {
    return SkStringPrintf("TiledGradientEffect(mirror=%s, makePremul=%s, colorsAreOpaque=%s)",
                          (mirror ? "true" : "false"), (makePremul ? "true" : "false"),
--- a/src/gpu/gradients/generated/GrTiledGradientEffect.h
+++ b/src/gpu/gradients/generated/GrTiledGradientEffect.h
@ -28,7 +28,7 @@ public:
                std::move(colorizer), std::move(gradLayout), mirror, makePremul, colorsAreOpaque));
    }
    GrTiledGradientEffect(const GrTiledGradientEffect& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
@ -185,7 +185,7 @@ GrTwoPointConicalGradientLayout::GrTwoPointConicalGradientLayout(
 std::unique_ptr<GrFragmentProcessor> GrTwoPointConicalGradientLayout::clone() const {
    return std::make_unique<GrTwoPointConicalGradientLayout>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrTwoPointConicalGradientLayout::dumpInfo() const {
    return SkStringPrintf(
            "TwoPointConicalGradientLayout(type=%d, isRadiusIncreasing=%s, isFocalOnCircle=%s, "
--- a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
+++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
@ -27,7 +27,7 @@ public:
    static std::unique_ptr<GrFragmentProcessor> Make(const SkTwoPointConicalGradient& gradient,
                                                     const GrFPArgs& args);
    GrTwoPointConicalGradientLayout(const GrTwoPointConicalGradientLayout& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp
+++ b/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp
@ -344,7 +344,7 @@ GrUnrolledBinaryGradientColorizer::GrUnrolledBinaryGradientColorizer(
 std::unique_ptr<GrFragmentProcessor> GrUnrolledBinaryGradientColorizer::clone() const {
    return std::make_unique<GrUnrolledBinaryGradientColorizer>(*this);
 }
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrUnrolledBinaryGradientColorizer::dumpInfo() const {
    return SkStringPrintf(
            "UnrolledBinaryGradientColorizer(intervalCount=%d, scale0_1=float4(%f, %f, %f, %f), "
--- a/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h
+++ b/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h
@ -24,7 +24,7 @@ public:
                                                     const SkScalar* positions,
                                                     int count);
    GrUnrolledBinaryGradientColorizer(const GrUnrolledBinaryGradientColorizer& src);
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif
    std::unique_ptr<GrFragmentProcessor> clone() const override;
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@ -724,7 +724,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf("Count: %d\n", fPaths.count());
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@ -856,7 +856,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor.toBytes_RGBA(),
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@ -186,7 +186,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (const auto& path : fPaths) {
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@ -92,7 +92,7 @@ void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func) const {
    fProcessors.visitProxies(func);
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrAtlasTextOp::dumpInfo() const {
    SkString str;

--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@ -43,7 +43,7 @@ public:

    void visitProxies(const VisitProxyFunc& func) const override;

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif

--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@ -30,7 +30,7 @@ public:

    const char* name() const override { return "Clear"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.append(INHERITED::dumpInfo());
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@ -244,7 +244,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (const auto& geo : fLines) {
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@ -369,7 +369,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf("Color: 0x%08x Count: %d\n", fColor.toBytes_RGBA(), fPaths.count());
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@ -44,7 +44,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif

@ -186,7 +186,7 @@ DrawAtlasOp::DrawAtlasOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f&
    this->setTransformedBounds(bounds, viewMatrix, HasAABloat::kNo, IsHairline::kNo);
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString DrawAtlasOp::dumpInfo() const {
    SkString string;
    for (const auto& geo : fGeoData) {
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@ -37,7 +37,7 @@ GrDrawPathOpBase::GrDrawPathOpBase(uint32_t classID, const SkMatrix& viewMatrix,
        , fDoAA(GrAA::kYes == aa)
        , fProcessorSet(std::move(paint)) {}

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrDrawPathOp::dumpInfo() const {
    SkString string;
    string.printf("PATH: 0x%p", fPath.get());
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@ -80,7 +80,7 @@ public:

    const char* name() const override { return "DrawPath"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif

--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@ -455,7 +455,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override;
 #endif

@ -581,7 +581,7 @@ DrawVerticesOp::DrawVerticesOp(const Helper::MakeArgs& helperArgs,
                                zeroArea);
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString DrawVerticesOp::dumpInfo() const {
    SkString string;
    string.appendf("PrimType: %d, MeshCount %d, VCount: %d, ICount: %d\n", (int)fPrimitiveType,
--- a/src/gpu/ops/GrDrawableOp.h
+++ b/src/gpu/ops/GrDrawableOp.h
@ -26,7 +26,7 @@ public:

    const char* name() const override { return "Drawable"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        return INHERITED::dumpInfo();
    }
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@ -29,7 +29,7 @@ namespace {
 using VertexSpec = GrQuadPerEdgeAA::VertexSpec;
 using ColorType = GrQuadPerEdgeAA::ColorType;

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 static SkString dump_quad_info(int index, const GrQuad* deviceQuad,
                               const GrQuad* localQuad, const SkPMColor4f& color,
                               GrQuadAAFlags aaFlags) {
@ -120,7 +120,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString str;
        str.appendf("# draws: %u\n", fQuads.count());
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@ -173,7 +173,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString str;

--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@ -180,7 +180,7 @@ public:
    }

    /** Used for spewing information about ops when debugging. */
-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    virtual SkString dumpInfo() const {
        SkString string;
        string.appendf("OpBounds: [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@ -1226,7 +1226,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (int i = 0; i < fCircles.count(); ++i) {
@ -1588,7 +1588,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (int i = 0; i < fCircles.count(); ++i) {
@ -1919,7 +1919,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf("Stroked: %d\n", fStroked);
@ -2196,7 +2196,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (const auto& geo : fEllipses) {
@ -2546,7 +2546,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (int i = 0; i < fRRects.count(); ++i) {
@ -2918,7 +2918,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf("Stroked: %d\n", fStroked);
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@ -72,7 +72,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString str;
        str.appendf("# combined: %d\n", fRegions.count());
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@ -239,7 +239,7 @@ public:

    const char* name() const override { return "ShadowCircularRRectOp"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (int i = 0; i < fGeoData.count(); ++i) {
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@ -214,7 +214,7 @@ GrProgramInfo* GrSimpleMeshDrawOpHelper::createProgramInfo(
                             this->pipelineFlags());
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 static void dump_pipeline_flags(GrPipeline::InputFlags flags, SkString* result) {
    if (GrPipeline::InputFlags::kNone != flags) {
        if (flags & GrPipeline::InputFlags::kSnapVerticesToPixelCenters) {
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@ -114,7 +114,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const;
 #endif
    GrAAType aaType() const { return static_cast<GrAAType>(fAAType); }
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
@ -89,7 +89,7 @@ GrProgramInfo* GrSimpleMeshDrawOpHelperWithStencil::createProgramInfoWithStencil
                             this->stencilSettings());
 }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
 SkString GrSimpleMeshDrawOpHelperWithStencil::dumpInfo() const {
    SkString result = INHERITED::dumpInfo();
    result.appendf("Stencil settings: %s\n", (fStencilSettings ? "yes" : "no"));
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
@ -78,7 +78,7 @@ public:
                      const SkRect& thisBounds, const SkRect& thatBounds,
                      bool ignoreAAType = false) const;

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const;
 #endif

--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@ -136,7 +136,7 @@ public:
        fHelper.visitProxies(func);
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (const auto& geo : fShapes) {
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@ -30,7 +30,7 @@ public:

    const char* name() const override { return "StencilPathOp"; }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.printf("Path: 0x%p, AA: %d", fPath.get(), fUseHWAA);
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@ -99,7 +99,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        string.appendf(
@ -428,7 +428,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString string;
        for (const auto& info : fRects) {
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@ -276,7 +276,7 @@ public:
        }
    }

-#ifdef SK_DEBUG
+#if GR_TEST_UTILS
    SkString dumpInfo() const override {
        SkString str;
        str.appendf("# draws: %d\n", fQuads.count());
@ -308,7 +308,9 @@ public:
        str += INHERITED::dumpInfo();
        return str;
    }
+#endif

+#ifdef SK_DEBUG
    static void ValidateResourceLimits() {
        // The op implementation has an upper bound on the number of quads that it can represent.
        // However, the resource manager imposes its own limit on the number of quads, which should
--- a/Show More
+++ b/Show More