moved files generated from .fp files into generated/ directories
Bug: skia:
Change-Id: I8605cdfcc0b1c56c23a6075c7fe188ab7384681c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/207221
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index e175d2e..c4fe485 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -29,11 +29,11 @@
#include "GrShape.h"
#include "GrStyle.h"
#include "GrTextureProxy.h"
-#include "effects/GrCircleBlurFragmentProcessor.h"
-#include "effects/GrRectBlurEffect.h"
-#include "effects/GrRRectBlurEffect.h"
-#include "effects/GrSimpleTextureEffect.h"
#include "effects/GrTextureDomain.h"
+#include "effects/generated/GrCircleBlurFragmentProcessor.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
+#include "effects/generated/GrRectBlurEffect.h"
+#include "effects/generated/GrRRectBlurEffect.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index fc1d45f..0955027 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -22,7 +22,7 @@
#if SK_SUPPORT_GPU
#include "GrFragmentProcessor.h"
-#include "effects/GrMixerEffect.h"
+#include "effects/generated/GrMixerEffect.h"
#endif
bool SkColorFilter::asColorMode(SkColor*, SkBlendMode*) const {
diff --git a/src/core/SkColorFilter_Mixer.cpp b/src/core/SkColorFilter_Mixer.cpp
index 8636216..a67b749 100644
--- a/src/core/SkColorFilter_Mixer.cpp
+++ b/src/core/SkColorFilter_Mixer.cpp
@@ -84,7 +84,7 @@
#if SK_SUPPORT_GPU
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
/////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkMixer.cpp b/src/core/SkMixer.cpp
index c148822..5fb76f1 100644
--- a/src/core/SkMixer.cpp
+++ b/src/core/SkMixer.cpp
@@ -15,7 +15,7 @@
#if SK_SUPPORT_GPU
#include "GrRecordingContext.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrSkSLFP.h"
#include "effects/GrXfermodeFragmentProcessor.h"
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index 2d36c33..9e4855e 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -75,7 +75,7 @@
#if SK_SUPPORT_GPU
#include "GrBlend.h"
#include "effects/GrXfermodeFragmentProcessor.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "SkGr.h"
std::unique_ptr<GrFragmentProcessor> SkModeColorFilter::asFragmentProcessor(
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index 2452c25..a7b7ff2 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -13,7 +13,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
-#include "effects/GrLumaColorFilterEffect.h"
+#include "effects/generated/GrLumaColorFilterEffect.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#endif
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index 0011c5b..01a738e 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -23,8 +23,8 @@
#include "GrRecordingContextPriv.h"
#include "GrRenderTargetContext.h"
#include "GrTextureProxy.h"
-#include "effects/GrSimpleTextureEffect.h"
-#include "effects/GrAlphaThresholdFragmentProcessor.h"
+#include "effects/generated/GrAlphaThresholdFragmentProcessor.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
#endif
class SkAlphaThresholdFilterImpl : public SkImageFilter {
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 75d552d..0a174d5 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -22,7 +22,7 @@
#include "GrRenderTargetContext.h"
#include "GrTextureProxy.h"
#include "SkGr.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrSkSLFP.h"
#include "effects/GrTextureDomain.h"
#include "glsl/GrGLSLFragmentProcessor.h"
diff --git a/src/effects/imagefilters/SkMagnifierImageFilter.cpp b/src/effects/imagefilters/SkMagnifierImageFilter.cpp
index f141dac..ed9f3c7 100644
--- a/src/effects/imagefilters/SkMagnifierImageFilter.cpp
+++ b/src/effects/imagefilters/SkMagnifierImageFilter.cpp
@@ -21,7 +21,7 @@
#include "GrContext.h"
#include "GrCoordTransform.h"
#include "GrTexture.h"
-#include "effects/GrMagnifierEffect.h"
+#include "effects/generated/GrMagnifierEffect.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index 6cd7b9d..8cd21c8 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -23,9 +23,9 @@
#include "GrRenderTargetContext.h"
#include "GrTextureProxy.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrTextureDomain.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
#include "SkGr.h"
#endif
#include "SkClipOpPriv.h"
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 46d1afd..2b61aef 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -18,7 +18,7 @@
#include "GrSoftwarePathRenderer.h"
#include "GrStyle.h"
#include "GrTextureProxy.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
#include "SkDraw.h"
#include "SkGr.h"
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 6e19511..c73f9ca 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -25,7 +25,7 @@
#include "SkSurface_Gpu.h"
#include "SkTaskGroup.h"
#include "SkTraceMemoryDump.h"
-#include "effects/GrConfigConversionEffect.h"
+#include "effects/generated/GrConfigConversionEffect.h"
#include "effects/GrSkSLFP.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
#include "text/GrTextBlobCache.h"
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index eaa0ae0..3d6ec03 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -9,8 +9,8 @@
#include "GrCoordTransform.h"
#include "GrPipeline.h"
#include "GrProcessorAnalysis.h"
-#include "effects/GrConstColorProcessor.h"
-#include "effects/GrPremulInputFragmentProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
+#include "effects/generated/GrPremulInputFragmentProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
index ee09a26..cb1ab0c 100644
--- a/src/gpu/GrPaint.cpp
+++ b/src/gpu/GrPaint.cpp
@@ -9,7 +9,7 @@
#include "GrXferProcessor.h"
#include "effects/GrCoverageSetOpXP.h"
#include "effects/GrPorterDuffXferProcessor.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
GrPaint::GrPaint(const GrPaint& that)
: fXPFactory(that.fXPFactory)
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 9bef15b..39dc0c3 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -23,7 +23,7 @@
#include "effects/GrCoverageSetOpXP.h"
#include "effects/GrDisableColorXP.h"
#include "effects/GrPorterDuffXferProcessor.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
class GrAppliedClip;
class GrOp;
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 74bd2d5..1123876 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -22,7 +22,7 @@
#include "GrUserStencilSettings.h"
#include "SkClipOpPriv.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
-#include "effects/GrAARectEffect.h"
+#include "effects/generated/GrAARectEffect.h"
#include "effects/GrConvexPolyEffect.h"
#include "effects/GrRRectEffect.h"
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 6587174..b9a952f 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -17,7 +17,7 @@
#include "SkMipMap.h"
#include "SkRectPriv.h"
#include "effects/GrBicubicEffect.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
#include "effects/GrTextureDomain.h"
sk_sp<GrTextureProxy> GrTextureProducer::CopyOnGpu(GrRecordingContext* context,
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index fbbe608..8f4d772 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -23,7 +23,7 @@
#include "SkMaskFilterBase.h"
#include "SkYUVAIndex.h"
#include "effects/GrBicubicEffect.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
#include "effects/GrTextureDomain.h"
namespace {
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 4206687..5fc363b 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -37,7 +37,7 @@
#include "SkTemplates.h"
#include "SkTraceEvent.h"
#include "effects/GrBicubicEffect.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrPorterDuffXferProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
#include "effects/GrSkSLFP.h"
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index 625427a..32c03af 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -7,8 +7,8 @@
#include "GrConvexPolyEffect.h"
#include "SkPathPriv.h"
-#include "effects/GrAARectEffect.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrAARectEffect.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
index a475ec0..cb8e689 100644
--- a/src/gpu/effects/GrOvalEffect.cpp
+++ b/src/gpu/effects/GrOvalEffect.cpp
@@ -7,8 +7,8 @@
#include "GrOvalEffect.h"
-#include "GrCircleEffect.h"
-#include "GrEllipseEffect.h"
+#include "generated/GrCircleEffect.h"
+#include "generated/GrEllipseEffect.h"
#include "SkRect.h"
std::unique_ptr<GrFragmentProcessor> GrOvalEffect::Make(GrClipEdgeType edgeType, const SkRect& oval,
diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 1c7673e..2e628ea 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -474,7 +474,7 @@
#if GR_TEST_UTILS
-#include "GrConstColorProcessor.h"
+#include "generated/GrConstColorProcessor.h"
#include "GrContext.h"
#include "SkArithmeticImageFilter.h"
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 3cc2a1f..7121bac 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -9,10 +9,10 @@
#include "GrProxyProvider.h"
#include "GrShaderCaps.h"
-#include "GrSimpleTextureEffect.h"
#include "GrSurfaceProxyPriv.h"
#include "GrTexture.h"
#include "SkFloatingPoint.h"
+#include "generated/GrSimpleTextureEffect.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index e207e15..e3064bf 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -7,8 +7,8 @@
#include "GrXfermodeFragmentProcessor.h"
-#include "GrConstColorProcessor.h"
#include "GrFragmentProcessor.h"
+#include "generated/GrConstColorProcessor.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLBlend.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/effects/GrAARectEffect.cpp b/src/gpu/effects/generated/GrAARectEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrAARectEffect.cpp
rename to src/gpu/effects/generated/GrAARectEffect.cpp
diff --git a/src/gpu/effects/GrAARectEffect.h b/src/gpu/effects/generated/GrAARectEffect.h
similarity index 100%
rename from src/gpu/effects/GrAARectEffect.h
rename to src/gpu/effects/generated/GrAARectEffect.h
diff --git a/src/gpu/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
similarity index 100%
rename from src/gpu/effects/GrAlphaThresholdFragmentProcessor.cpp
rename to src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
diff --git a/src/gpu/effects/GrAlphaThresholdFragmentProcessor.h b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h
similarity index 100%
rename from src/gpu/effects/GrAlphaThresholdFragmentProcessor.h
rename to src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h
diff --git a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.cpp b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
similarity index 100%
rename from src/gpu/effects/GrBlurredEdgeFragmentProcessor.cpp
rename to src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
diff --git a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
similarity index 100%
rename from src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
rename to src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
diff --git a/src/gpu/effects/GrCircleBlurFragmentProcessor.cpp b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
similarity index 100%
rename from src/gpu/effects/GrCircleBlurFragmentProcessor.cpp
rename to src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
diff --git a/src/gpu/effects/GrCircleBlurFragmentProcessor.h b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h
similarity index 100%
rename from src/gpu/effects/GrCircleBlurFragmentProcessor.h
rename to src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h
diff --git a/src/gpu/effects/generated/GrCircleEffect.cpp b/src/gpu/effects/generated/GrCircleEffect.cpp
new file mode 100644
index 0000000..f24f2d7
--- /dev/null
+++ b/src/gpu/effects/generated/GrCircleEffect.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**************************************************************************************************
+ *** This file was autogenerated from GrCircleEffect.fp; do not modify.
+ **************************************************************************************************/
+#include "GrCircleEffect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "GrTexture.h"
+#include "SkSLCPP.h"
+#include "SkSLUtil.h"
+class GrGLSLCircleEffect : public GrGLSLFragmentProcessor {
+public:
+ GrGLSLCircleEffect() {}
+ void emitCode(EmitArgs& args) override {
+ GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
+ const GrCircleEffect& _outer = args.fFp.cast<GrCircleEffect>();
+ (void)_outer;
+ auto edgeType = _outer.edgeType;
+ (void)edgeType;
+ auto center = _outer.center;
+ (void)center;
+ auto radius = _outer.radius;
+ (void)radius;
+ prevRadius = -1.0;
+ circleVar =
+ args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType, "circle");
+ fragBuilder->codeAppendf(
+ "half2 prevCenter;\nhalf prevRadius = %f;\nhalf d;\n@if (%d == 2 || %d == 3) {\n "
+ " d = half((length((float2(%s.xy) - sk_FragCoord.xy) * float(%s.w)) - 1.0) * "
+ "float(%s.z));\n} else {\n d = half((1.0 - length((float2(%s.xy) - "
+ "sk_FragCoord.xy) * float(%s.w))) * float(%s.z));\n}\n@if ((%d == 1 || %d == 3) || "
+ "%d == 4) {\n d = clamp(d, 0.0, 1.0);\n} else {\n d = d > 0.5 ? 1.0 : "
+ "0.0;\n}\n%s = %s * d;\n",
+ prevRadius, (int)_outer.edgeType, (int)_outer.edgeType,
+ args.fUniformHandler->getUniformCStr(circleVar),
+ args.fUniformHandler->getUniformCStr(circleVar),
+ args.fUniformHandler->getUniformCStr(circleVar),
+ args.fUniformHandler->getUniformCStr(circleVar),
+ args.fUniformHandler->getUniformCStr(circleVar),
+ args.fUniformHandler->getUniformCStr(circleVar), (int)_outer.edgeType,
+ (int)_outer.edgeType, (int)_outer.edgeType, args.fOutputColor, args.fInputColor);
+ }
+
+private:
+ void onSetData(const GrGLSLProgramDataManager& pdman,
+ const GrFragmentProcessor& _proc) override {
+ const GrCircleEffect& _outer = _proc.cast<GrCircleEffect>();
+ auto edgeType = _outer.edgeType;
+ (void)edgeType;
+ auto center = _outer.center;
+ (void)center;
+ auto radius = _outer.radius;
+ (void)radius;
+ UniformHandle& circle = circleVar;
+ (void)circle;
+
+ if (radius != prevRadius || center != prevCenter) {
+ SkScalar effectiveRadius = radius;
+ if (GrProcessorEdgeTypeIsInverseFill((GrClipEdgeType)edgeType)) {
+ effectiveRadius -= 0.5f;
+ // When the radius is 0.5 effectiveRadius is 0 which causes an inf * 0 in the
+ // shader.
+ effectiveRadius = SkTMax(0.001f, effectiveRadius);
+ } else {
+ effectiveRadius += 0.5f;
+ }
+ pdman.set4f(circle, center.fX, center.fY, effectiveRadius,
+ SkScalarInvert(effectiveRadius));
+ prevCenter = center;
+ prevRadius = radius;
+ }
+ }
+ SkPoint prevCenter = half2(0);
+ float prevRadius = 0;
+ UniformHandle circleVar;
+};
+GrGLSLFragmentProcessor* GrCircleEffect::onCreateGLSLInstance() const {
+ return new GrGLSLCircleEffect();
+}
+void GrCircleEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps,
+ GrProcessorKeyBuilder* b) const {
+ b->add32((int32_t)edgeType);
+}
+bool GrCircleEffect::onIsEqual(const GrFragmentProcessor& other) const {
+ const GrCircleEffect& that = other.cast<GrCircleEffect>();
+ (void)that;
+ if (edgeType != that.edgeType) return false;
+ if (center != that.center) return false;
+ if (radius != that.radius) return false;
+ return true;
+}
+GrCircleEffect::GrCircleEffect(const GrCircleEffect& src)
+ : INHERITED(kGrCircleEffect_ClassID, src.optimizationFlags())
+ , edgeType(src.edgeType)
+ , center(src.center)
+ , radius(src.radius) {}
+std::unique_ptr<GrFragmentProcessor> GrCircleEffect::clone() const {
+ return std::unique_ptr<GrFragmentProcessor>(new GrCircleEffect(*this));
+}
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCircleEffect);
+#if GR_TEST_UTILS
+std::unique_ptr<GrFragmentProcessor> GrCircleEffect::TestCreate(GrProcessorTestData* testData) {
+ SkPoint center;
+ center.fX = testData->fRandom->nextRangeScalar(0.f, 1000.f);
+ center.fY = testData->fRandom->nextRangeScalar(0.f, 1000.f);
+ SkScalar radius = testData->fRandom->nextRangeF(1.f, 1000.f);
+ GrClipEdgeType et;
+ do {
+ et = (GrClipEdgeType)testData->fRandom->nextULessThan(kGrClipEdgeTypeCnt);
+ } while (GrClipEdgeType::kHairlineAA == et);
+ return GrCircleEffect::Make(et, center, radius);
+}
+#endif
diff --git a/src/gpu/effects/generated/GrCircleEffect.h b/src/gpu/effects/generated/GrCircleEffect.h
new file mode 100644
index 0000000..81ab40e
--- /dev/null
+++ b/src/gpu/effects/generated/GrCircleEffect.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**************************************************************************************************
+ *** This file was autogenerated from GrCircleEffect.fp; do not modify.
+ **************************************************************************************************/
+#ifndef GrCircleEffect_DEFINED
+#define GrCircleEffect_DEFINED
+#include "SkTypes.h"
+#include "GrFragmentProcessor.h"
+#include "GrCoordTransform.h"
+class GrCircleEffect : public GrFragmentProcessor {
+public:
+ static std::unique_ptr<GrFragmentProcessor> Make(GrClipEdgeType edgeType, SkPoint center,
+ float radius) {
+ // A radius below half causes the implicit insetting done by this processor to become
+ // inverted. We could handle this case by making the processor code more complicated.
+ if (radius < .5f && GrProcessorEdgeTypeIsInverseFill(edgeType)) {
+ return nullptr;
+ }
+ return std::unique_ptr<GrFragmentProcessor>(new GrCircleEffect(edgeType, center, radius));
+ }
+ GrCircleEffect(const GrCircleEffect& src);
+ std::unique_ptr<GrFragmentProcessor> clone() const override;
+ const char* name() const override { return "CircleEffect"; }
+ GrClipEdgeType edgeType;
+ SkPoint center;
+ float radius;
+
+private:
+ GrCircleEffect(GrClipEdgeType edgeType, SkPoint center, float radius)
+ : INHERITED(kGrCircleEffect_ClassID,
+ (OptimizationFlags)kCompatibleWithCoverageAsAlpha_OptimizationFlag)
+ , edgeType(edgeType)
+ , center(center)
+ , radius(radius) {}
+ GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+ void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+ bool onIsEqual(const GrFragmentProcessor&) const override;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
+ typedef GrFragmentProcessor INHERITED;
+};
+#endif
diff --git a/src/gpu/effects/GrComposeLerpEffect.cpp b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrComposeLerpEffect.cpp
rename to src/gpu/effects/generated/GrComposeLerpEffect.cpp
diff --git a/src/gpu/effects/GrComposeLerpEffect.h b/src/gpu/effects/generated/GrComposeLerpEffect.h
similarity index 100%
rename from src/gpu/effects/GrComposeLerpEffect.h
rename to src/gpu/effects/generated/GrComposeLerpEffect.h
diff --git a/src/gpu/effects/GrComposeLerpRedEffect.cpp b/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrComposeLerpRedEffect.cpp
rename to src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
diff --git a/src/gpu/effects/GrComposeLerpRedEffect.h b/src/gpu/effects/generated/GrComposeLerpRedEffect.h
similarity index 100%
rename from src/gpu/effects/GrComposeLerpRedEffect.h
rename to src/gpu/effects/generated/GrComposeLerpRedEffect.h
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrConfigConversionEffect.cpp
rename to src/gpu/effects/generated/GrConfigConversionEffect.cpp
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/generated/GrConfigConversionEffect.h
similarity index 100%
rename from src/gpu/effects/GrConfigConversionEffect.h
rename to src/gpu/effects/generated/GrConfigConversionEffect.h
diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/generated/GrConstColorProcessor.cpp
similarity index 100%
rename from src/gpu/effects/GrConstColorProcessor.cpp
rename to src/gpu/effects/generated/GrConstColorProcessor.cpp
diff --git a/src/gpu/effects/GrConstColorProcessor.h b/src/gpu/effects/generated/GrConstColorProcessor.h
similarity index 100%
rename from src/gpu/effects/GrConstColorProcessor.h
rename to src/gpu/effects/generated/GrConstColorProcessor.h
diff --git a/src/gpu/effects/GrEllipseEffect.cpp b/src/gpu/effects/generated/GrEllipseEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrEllipseEffect.cpp
rename to src/gpu/effects/generated/GrEllipseEffect.cpp
diff --git a/src/gpu/effects/GrEllipseEffect.h b/src/gpu/effects/generated/GrEllipseEffect.h
similarity index 100%
rename from src/gpu/effects/GrEllipseEffect.h
rename to src/gpu/effects/generated/GrEllipseEffect.h
diff --git a/src/gpu/effects/GrLumaColorFilterEffect.cpp b/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrLumaColorFilterEffect.cpp
rename to src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
diff --git a/src/gpu/effects/GrLumaColorFilterEffect.h b/src/gpu/effects/generated/GrLumaColorFilterEffect.h
similarity index 100%
rename from src/gpu/effects/GrLumaColorFilterEffect.h
rename to src/gpu/effects/generated/GrLumaColorFilterEffect.h
diff --git a/src/gpu/effects/GrMagnifierEffect.cpp b/src/gpu/effects/generated/GrMagnifierEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrMagnifierEffect.cpp
rename to src/gpu/effects/generated/GrMagnifierEffect.cpp
diff --git a/src/gpu/effects/GrMagnifierEffect.h b/src/gpu/effects/generated/GrMagnifierEffect.h
similarity index 100%
rename from src/gpu/effects/GrMagnifierEffect.h
rename to src/gpu/effects/generated/GrMagnifierEffect.h
diff --git a/src/gpu/effects/GrMixerEffect.cpp b/src/gpu/effects/generated/GrMixerEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrMixerEffect.cpp
rename to src/gpu/effects/generated/GrMixerEffect.cpp
diff --git a/src/gpu/effects/GrMixerEffect.h b/src/gpu/effects/generated/GrMixerEffect.h
similarity index 100%
rename from src/gpu/effects/GrMixerEffect.h
rename to src/gpu/effects/generated/GrMixerEffect.h
diff --git a/src/gpu/effects/GrPremulInputFragmentProcessor.cpp b/src/gpu/effects/generated/GrPremulInputFragmentProcessor.cpp
similarity index 100%
rename from src/gpu/effects/GrPremulInputFragmentProcessor.cpp
rename to src/gpu/effects/generated/GrPremulInputFragmentProcessor.cpp
diff --git a/src/gpu/effects/GrPremulInputFragmentProcessor.h b/src/gpu/effects/generated/GrPremulInputFragmentProcessor.h
similarity index 100%
rename from src/gpu/effects/GrPremulInputFragmentProcessor.h
rename to src/gpu/effects/generated/GrPremulInputFragmentProcessor.h
diff --git a/src/gpu/effects/GrRRectBlurEffect.cpp b/src/gpu/effects/generated/GrRRectBlurEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrRRectBlurEffect.cpp
rename to src/gpu/effects/generated/GrRRectBlurEffect.cpp
diff --git a/src/gpu/effects/GrRRectBlurEffect.h b/src/gpu/effects/generated/GrRRectBlurEffect.h
similarity index 100%
rename from src/gpu/effects/GrRRectBlurEffect.h
rename to src/gpu/effects/generated/GrRRectBlurEffect.h
diff --git a/src/gpu/effects/GrRectBlurEffect.cpp b/src/gpu/effects/generated/GrRectBlurEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrRectBlurEffect.cpp
rename to src/gpu/effects/generated/GrRectBlurEffect.cpp
diff --git a/src/gpu/effects/GrRectBlurEffect.h b/src/gpu/effects/generated/GrRectBlurEffect.h
similarity index 100%
rename from src/gpu/effects/GrRectBlurEffect.h
rename to src/gpu/effects/generated/GrRectBlurEffect.h
diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/generated/GrSimpleTextureEffect.cpp
similarity index 100%
rename from src/gpu/effects/GrSimpleTextureEffect.cpp
rename to src/gpu/effects/generated/GrSimpleTextureEffect.cpp
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/generated/GrSimpleTextureEffect.h
similarity index 100%
rename from src/gpu/effects/GrSimpleTextureEffect.h
rename to src/gpu/effects/generated/GrSimpleTextureEffect.h
diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/gradients/GrGradientShader.cpp
index f8fd4a5..ac60b21 100644
--- a/src/gpu/gradients/GrGradientShader.cpp
+++ b/src/gpu/gradients/GrGradientShader.cpp
@@ -7,18 +7,18 @@
#include "GrGradientShader.h"
-#include "GrClampedGradientEffect.h"
-#include "GrTiledGradientEffect.h"
+#include "generated/GrClampedGradientEffect.h"
+#include "generated/GrTiledGradientEffect.h"
-#include "GrLinearGradientLayout.h"
-#include "GrRadialGradientLayout.h"
-#include "GrSweepGradientLayout.h"
-#include "GrTwoPointConicalGradientLayout.h"
+#include "generated/GrLinearGradientLayout.h"
+#include "generated/GrRadialGradientLayout.h"
+#include "generated/GrSweepGradientLayout.h"
+#include "generated/GrTwoPointConicalGradientLayout.h"
-#include "GrDualIntervalGradientColorizer.h"
-#include "GrSingleIntervalGradientColorizer.h"
-#include "GrTextureGradientColorizer.h"
-#include "GrUnrolledBinaryGradientColorizer.h"
+#include "generated/GrDualIntervalGradientColorizer.h"
+#include "generated/GrSingleIntervalGradientColorizer.h"
+#include "generated/GrTextureGradientColorizer.h"
+#include "generated/GrUnrolledBinaryGradientColorizer.h"
#include "GrGradientBitmapCache.h"
#include "GrCaps.h"
diff --git a/src/gpu/gradients/GrLinearGradientLayout.fp b/src/gpu/gradients/GrLinearGradientLayout.fp
index bd14431..7c61f0e 100644
--- a/src/gpu/gradients/GrLinearGradientLayout.fp
+++ b/src/gpu/gradients/GrLinearGradientLayout.fp
@@ -27,7 +27,7 @@
@header {
#include "SkLinearGradient.h"
- #include "GrGradientShader.h"
+ #include "../GrGradientShader.h"
}
// The linear gradient never rejects a pixel so it doesn't change opacity
diff --git a/src/gpu/gradients/GrRadialGradientLayout.fp b/src/gpu/gradients/GrRadialGradientLayout.fp
index 6d186e5..fd47295 100644
--- a/src/gpu/gradients/GrRadialGradientLayout.fp
+++ b/src/gpu/gradients/GrRadialGradientLayout.fp
@@ -20,7 +20,7 @@
@header {
#include "SkRadialGradient.h"
- #include "GrGradientShader.h"
+ #include "../GrGradientShader.h"
}
// The radial gradient never rejects a pixel so it doesn't change opacity
diff --git a/src/gpu/gradients/GrSweepGradientLayout.fp b/src/gpu/gradients/GrSweepGradientLayout.fp
index 4f98612..0c29194 100644
--- a/src/gpu/gradients/GrSweepGradientLayout.fp
+++ b/src/gpu/gradients/GrSweepGradientLayout.fp
@@ -37,7 +37,7 @@
@header {
#include "SkSweepGradient.h"
- #include "GrGradientShader.h"
+ #include "../GrGradientShader.h"
}
// The sweep gradient never rejects a pixel so it doesn't change opacity
diff --git a/src/gpu/gradients/GrTwoPointConicalGradientLayout.fp b/src/gpu/gradients/GrTwoPointConicalGradientLayout.fp
index 1c6ff67..cb8fb10 100644
--- a/src/gpu/gradients/GrTwoPointConicalGradientLayout.fp
+++ b/src/gpu/gradients/GrTwoPointConicalGradientLayout.fp
@@ -126,7 +126,7 @@
@header {
#include "SkTwoPointConicalGradient.h"
- #include "GrGradientShader.h"
+ #include "../GrGradientShader.h"
}
// The 2 point conical gradient can reject a pixel so it does change opacity
diff --git a/src/gpu/gradients/GrClampedGradientEffect.cpp b/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
similarity index 100%
rename from src/gpu/gradients/GrClampedGradientEffect.cpp
rename to src/gpu/gradients/generated/GrClampedGradientEffect.cpp
diff --git a/src/gpu/gradients/GrClampedGradientEffect.h b/src/gpu/gradients/generated/GrClampedGradientEffect.h
similarity index 100%
rename from src/gpu/gradients/GrClampedGradientEffect.h
rename to src/gpu/gradients/generated/GrClampedGradientEffect.h
diff --git a/src/gpu/gradients/GrDualIntervalGradientColorizer.cpp b/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp
similarity index 100%
rename from src/gpu/gradients/GrDualIntervalGradientColorizer.cpp
rename to src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp
diff --git a/src/gpu/gradients/GrDualIntervalGradientColorizer.h b/src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h
similarity index 100%
rename from src/gpu/gradients/GrDualIntervalGradientColorizer.h
rename to src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h
diff --git a/src/gpu/gradients/GrLinearGradientLayout.cpp b/src/gpu/gradients/generated/GrLinearGradientLayout.cpp
similarity index 100%
rename from src/gpu/gradients/GrLinearGradientLayout.cpp
rename to src/gpu/gradients/generated/GrLinearGradientLayout.cpp
diff --git a/src/gpu/gradients/GrLinearGradientLayout.h b/src/gpu/gradients/generated/GrLinearGradientLayout.h
similarity index 97%
rename from src/gpu/gradients/GrLinearGradientLayout.h
rename to src/gpu/gradients/generated/GrLinearGradientLayout.h
index 8f6a9ca..57da10f 100644
--- a/src/gpu/gradients/GrLinearGradientLayout.h
+++ b/src/gpu/gradients/generated/GrLinearGradientLayout.h
@@ -13,7 +13,7 @@
#include "SkTypes.h"
#include "SkLinearGradient.h"
-#include "GrGradientShader.h"
+#include "../GrGradientShader.h"
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrLinearGradientLayout : public GrFragmentProcessor {
diff --git a/src/gpu/gradients/GrRadialGradientLayout.cpp b/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
similarity index 100%
rename from src/gpu/gradients/GrRadialGradientLayout.cpp
rename to src/gpu/gradients/generated/GrRadialGradientLayout.cpp
diff --git a/src/gpu/gradients/GrRadialGradientLayout.h b/src/gpu/gradients/generated/GrRadialGradientLayout.h
similarity index 97%
rename from src/gpu/gradients/GrRadialGradientLayout.h
rename to src/gpu/gradients/generated/GrRadialGradientLayout.h
index 38f5143..a70202c 100644
--- a/src/gpu/gradients/GrRadialGradientLayout.h
+++ b/src/gpu/gradients/generated/GrRadialGradientLayout.h
@@ -13,7 +13,7 @@
#include "SkTypes.h"
#include "SkRadialGradient.h"
-#include "GrGradientShader.h"
+#include "../GrGradientShader.h"
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrRadialGradientLayout : public GrFragmentProcessor {
diff --git a/src/gpu/gradients/GrSingleIntervalGradientColorizer.cpp b/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp
similarity index 100%
rename from src/gpu/gradients/GrSingleIntervalGradientColorizer.cpp
rename to src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp
diff --git a/src/gpu/gradients/GrSingleIntervalGradientColorizer.h b/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h
similarity index 100%
rename from src/gpu/gradients/GrSingleIntervalGradientColorizer.h
rename to src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h
diff --git a/src/gpu/gradients/GrSweepGradientLayout.cpp b/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
similarity index 100%
rename from src/gpu/gradients/GrSweepGradientLayout.cpp
rename to src/gpu/gradients/generated/GrSweepGradientLayout.cpp
diff --git a/src/gpu/gradients/GrSweepGradientLayout.h b/src/gpu/gradients/generated/GrSweepGradientLayout.h
similarity index 97%
rename from src/gpu/gradients/GrSweepGradientLayout.h
rename to src/gpu/gradients/generated/GrSweepGradientLayout.h
index c117b01..b62ed3e 100644
--- a/src/gpu/gradients/GrSweepGradientLayout.h
+++ b/src/gpu/gradients/generated/GrSweepGradientLayout.h
@@ -13,7 +13,7 @@
#include "SkTypes.h"
#include "SkSweepGradient.h"
-#include "GrGradientShader.h"
+#include "../GrGradientShader.h"
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrSweepGradientLayout : public GrFragmentProcessor {
diff --git a/src/gpu/gradients/GrTextureGradientColorizer.cpp b/src/gpu/gradients/generated/GrTextureGradientColorizer.cpp
similarity index 100%
rename from src/gpu/gradients/GrTextureGradientColorizer.cpp
rename to src/gpu/gradients/generated/GrTextureGradientColorizer.cpp
diff --git a/src/gpu/gradients/GrTextureGradientColorizer.h b/src/gpu/gradients/generated/GrTextureGradientColorizer.h
similarity index 100%
rename from src/gpu/gradients/GrTextureGradientColorizer.h
rename to src/gpu/gradients/generated/GrTextureGradientColorizer.h
diff --git a/src/gpu/gradients/GrTiledGradientEffect.cpp b/src/gpu/gradients/generated/GrTiledGradientEffect.cpp
similarity index 100%
rename from src/gpu/gradients/GrTiledGradientEffect.cpp
rename to src/gpu/gradients/generated/GrTiledGradientEffect.cpp
diff --git a/src/gpu/gradients/GrTiledGradientEffect.h b/src/gpu/gradients/generated/GrTiledGradientEffect.h
similarity index 100%
rename from src/gpu/gradients/GrTiledGradientEffect.h
rename to src/gpu/gradients/generated/GrTiledGradientEffect.h
diff --git a/src/gpu/gradients/GrTwoPointConicalGradientLayout.cpp b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
similarity index 100%
rename from src/gpu/gradients/GrTwoPointConicalGradientLayout.cpp
rename to src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
diff --git a/src/gpu/gradients/GrTwoPointConicalGradientLayout.h b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
similarity index 98%
rename from src/gpu/gradients/GrTwoPointConicalGradientLayout.h
rename to src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
index a82c954..ef4dc2d 100644
--- a/src/gpu/gradients/GrTwoPointConicalGradientLayout.h
+++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
@@ -13,7 +13,7 @@
#include "SkTypes.h"
#include "SkTwoPointConicalGradient.h"
-#include "GrGradientShader.h"
+#include "../GrGradientShader.h"
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrTwoPointConicalGradientLayout : public GrFragmentProcessor {
diff --git a/src/gpu/gradients/GrUnrolledBinaryGradientColorizer.cpp b/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp
similarity index 100%
rename from src/gpu/gradients/GrUnrolledBinaryGradientColorizer.cpp
rename to src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp
diff --git a/src/gpu/gradients/GrUnrolledBinaryGradientColorizer.h b/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h
similarity index 100%
rename from src/gpu/gradients/GrUnrolledBinaryGradientColorizer.h
rename to src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h
diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp
index d3870d5..9884e9a 100644
--- a/src/shaders/SkColorShader.cpp
+++ b/src/shaders/SkColorShader.cpp
@@ -105,7 +105,7 @@
#include "GrColorSpaceInfo.h"
#include "GrColorSpaceXform.h"
#include "SkGr.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
std::unique_ptr<GrFragmentProcessor> SkColorShader::asFragmentProcessor(
const GrFPArgs& args) const {
diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp
index 98fd2df..d4a7baa 100644
--- a/src/shaders/SkComposeShader.cpp
+++ b/src/shaders/SkComposeShader.cpp
@@ -184,11 +184,11 @@
#if SK_SUPPORT_GPU
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
#include "GrRecordingContext.h"
-#include "effects/GrComposeLerpEffect.h"
-#include "effects/GrComposeLerpRedEffect.h"
+#include "effects/generated/GrComposeLerpEffect.h"
+#include "effects/generated/GrComposeLerpRedEffect.h"
static std::unique_ptr<GrFragmentProcessor> as_fp(const GrFPArgs& args, SkShader* shader) {
return shader ? as_SB(shader)->asFragmentProcessor(args) : nullptr;
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 42eea81..581a310 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -170,7 +170,7 @@
#include "GrRecordingContextPriv.h"
#include "SkGr.h"
#include "effects/GrBicubicEffect.h"
-#include "effects/GrSimpleTextureEffect.h"
+#include "effects/generated/GrSimpleTextureEffect.h"
static GrSamplerState::WrapMode tile_mode_to_wrap_mode(const SkTileMode tileMode) {
switch (tileMode) {
diff --git a/src/shaders/SkMixerShader.cpp b/src/shaders/SkMixerShader.cpp
index adf1fc1..6daef44 100644
--- a/src/shaders/SkMixerShader.cpp
+++ b/src/shaders/SkMixerShader.cpp
@@ -72,7 +72,7 @@
#if SK_SUPPORT_GPU
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
/////////////////////////////////////////////////////////////////////
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 4bfab9c..096acec 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -21,7 +21,7 @@
#include "GrRecordingContext.h"
#include "GrRecordingContextPriv.h"
#include "SkGr.h"
-#include "effects/GrConstColorProcessor.h"
+#include "effects/generated/GrConstColorProcessor.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index 92767b4..163314f 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -25,7 +25,7 @@
#include <new>
#if SK_SUPPORT_GPU
#include "GrShape.h"
-#include "effects/GrBlurredEdgeFragmentProcessor.h"
+#include "effects/generated/GrBlurredEdgeFragmentProcessor.h"
#endif
/**