Depower GrPipeline.h

This is mainly to get GrTextureEffect.h out of this header. Its distribution keeps gumming up efforts to make more classes V1-only.

Bug: skia:11837
Change-Id: I6d5aae20bb20cfe3fb4d93c526efe8cf7e5e0c52
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425017
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

gm/destcolor.cpp

@@ -17,6 +17,8 @@
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"

gm/fp_sample_chaining.cpp

@@ -10,6 +10,7 @@
 #include "include/effects/SkRuntimeEffect.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "tools/ToolUtils.h"

gm/fpcoordinateoverride.cpp

@@ -24,6 +24,7 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrRRectEffect.h"
 #include "src/gpu/effects/GrSkSLFP.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "tools/Resources.h"

gm/gpu_blur_utils.cpp

@@ -14,6 +14,7 @@
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/image/SkImage_Base.h"
 
 static GrSurfaceProxyView blur(GrRecordingContext* ctx,

gm/swizzle.cpp

@@ -15,6 +15,7 @@
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"

gm/texelsubset.cpp

@@ -22,6 +22,7 @@
 #include "src/gpu/GrSamplerState.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "tools/Resources.h"
 #include "tools/gpu/TestOps.h"
 

gm/windowrectangles.cpp

@@ -36,6 +36,8 @@
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrUserStencilSettings.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "tools/ToolUtils.h"
 
 #include <utility>

src/core/SkGpuBlurUtils.cpp

@@ -17,6 +17,7 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h"
 #include "src/gpu/effects/GrMatrixConvolutionEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 #if SK_GPU_V1
 

src/effects/imagefilters/SkArithmeticImageFilter.cpp

@@ -24,6 +24,7 @@
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrSkSLFP.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #endif
 
 namespace {

src/effects/imagefilters/SkDisplacementMapImageFilter.cpp

@@ -23,6 +23,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/effects/imagefilters/SkLightingImageFilter.cpp

@@ -25,8 +25,8 @@
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
-
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/effects/imagefilters/SkMorphologyImageFilter.cpp

@@ -22,6 +22,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/gpu/GrClipStackClip.cpp

@@ -25,6 +25,7 @@
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 #include "src/gpu/effects/GrRRectEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 
 typedef SkClipStack::Element Element;

src/gpu/GrCopyRenderTask.cpp

@@ -10,6 +10,7 @@
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrResourceAllocator.h"
+#include "src/gpu/geometry/GrRect.h"
 
 sk_sp<GrRenderTask> GrCopyRenderTask::Make(GrDrawingManager* drawingMgr,
                                            sk_sp<GrSurfaceProxy> src,

src/gpu/GrFragmentProcessor.cpp

@@ -11,6 +11,7 @@
 #include "src/gpu/GrProcessorAnalysis.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 #include "src/gpu/effects/GrSkSLFP.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/gpu/GrPipeline.cpp

@@ -9,8 +9,6 @@
 
 #include "src/gpu/GrAppliedClip.h"
 #include "src/gpu/GrCaps.h"
-#include "src/gpu/GrGpu.h"
-#include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/GrXferProcessor.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"

src/gpu/GrPipeline.h

@@ -8,7 +8,6 @@
 #ifndef GrPipeline_DEFINED
 #define GrPipeline_DEFINED
 
-#include "include/core/SkMatrix.h"
 #include "include/core/SkRefCnt.h"
 #include "src/gpu/GrColor.h"
 #include "src/gpu/GrDstProxyView.h"
@@ -18,11 +17,7 @@
 #include "src/gpu/GrSurfaceProxyView.h"
 #include "src/gpu/GrUserStencilSettings.h"
 #include "src/gpu/GrWindowRectsState.h"
-#include "src/gpu/effects/GrCoverageSetOpXP.h"
-#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/effects/GrPorterDuffXferProcessor.h"
-#include "src/gpu/effects/GrTextureEffect.h"
-#include "src/gpu/geometry/GrRect.h"
 
 class GrAppliedClip;
 class GrAppliedHardClip;
@@ -30,6 +25,7 @@ struct GrGLSLBuiltinUniformHandles;
 class GrGLSLProgramDataManager;
 class GrOp;
 class GrSurfaceDrawContext;
+class GrTextureEffect;
 
 /**
  * This immutable object contains information needed to build a shader program and set API
@@ -135,7 +131,7 @@ public:
     // input attachment.
     bool usesDstTexture() const { return this->dstProxyView() && !this->usesDstInputAttachment(); }
     bool usesDstInputAttachment() const {
-        return this->dstSampleFlags()& GrDstSampleFlags::kAsInputAttachment;
+        return this->dstSampleFlags() & GrDstSampleFlags::kAsInputAttachment;
     }
 
     /**

src/gpu/GrProgramDesc.cpp

@@ -16,6 +16,7 @@
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 

src/gpu/GrProgramInfo.cpp

@@ -8,6 +8,7 @@
 #include "src/gpu/GrProgramInfo.h"
 
 #include "src/gpu/GrStencilSettings.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 GrStencilSettings GrProgramInfo::nonGLStencilSettings() const {
     GrStencilSettings stencil;

src/gpu/GrSoftwarePathRenderer.cpp

@@ -23,6 +23,7 @@
 #include "src/gpu/GrSWMaskHelper.h"
 #include "src/gpu/GrUtil.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/GrDrawOp.h"
 

src/gpu/GrStencilMaskHelper.cpp

@@ -11,6 +11,7 @@
 #include "include/core/SkPath.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrStencilSettings.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/geometry/GrShape.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 

src/gpu/GrSurfaceContext.cpp

@@ -28,6 +28,7 @@
 #include "src/gpu/GrSurfaceFillContext.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrBicubicEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 #define ASSERT_SINGLE_OWNER         GR_ASSERT_SINGLE_OWNER(this->singleOwner())
 #define RETURN_FALSE_IF_ABANDONED   if (this->fContext->abandoned()) { return false;   }

src/gpu/GrSurfaceDrawContext.cpp

@@ -49,7 +49,9 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrBicubicEffect.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/effects/GrRRectEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrQuad.h"
 #include "src/gpu/geometry/GrQuadUtils.h"
 #include "src/gpu/geometry/GrStyledShape.h"

src/gpu/GrSurfaceFillContext.cpp

@@ -12,6 +12,8 @@
 #include "src/gpu/GrImageContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
+#include "src/gpu/effects/GrTextureEffect.h"
+#include "src/gpu/geometry/GrRect.h"
 #include "src/gpu/ops/GrClearOp.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 

src/gpu/d3d/GrD3DOpsRenderPass.cpp

@@ -19,6 +19,7 @@
 #include "src/gpu/d3d/GrD3DPipelineStateBuilder.h"
 #include "src/gpu/d3d/GrD3DRenderTarget.h"
 #include "src/gpu/d3d/GrD3DTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 #ifdef SK_DEBUG
 #include "include/gpu/GrDirectContext.h"

src/gpu/d3d/GrD3DPipelineState.cpp

@@ -15,6 +15,7 @@
 #include "src/gpu/d3d/GrD3DPipeline.h"
 #include "src/gpu/d3d/GrD3DRootSignature.h"
 #include "src/gpu/d3d/GrD3DTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
 #include "src/gpu/glsl/GrGLSLXferProcessor.h"

src/gpu/dawn/GrDawnProgramBuilder.cpp

@@ -13,6 +13,7 @@
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/dawn/GrDawnGpu.h"
 #include "src/gpu/dawn/GrDawnTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 static wgpu::BlendFactor to_dawn_blend_factor(GrBlendCoeff coeff) {
     switch (coeff) {

src/gpu/effects/GrConfigConversionEffect.fp

@@ -13,6 +13,7 @@ in fragmentProcessor inputFP;
     #include "src/gpu/GrImageInfo.h"
     #include "src/gpu/GrSurfaceDrawContext.h"
     #include "src/gpu/SkGr.h"
+    #include "src/gpu/effects/GrTextureEffect.h"
 }
 
 @class {

src/gpu/effects/GrMatrixEffect.cpp

@@ -8,6 +8,7 @@
 #include "src/gpu/effects/GrMatrixEffect.h"
 
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/GrYUVtoRGBEffect.cpp

@@ -12,6 +12,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrYUVATextureProxies.h"
 #include "src/gpu/effects/GrMatrixEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrConfigConversionEffect.h

@@ -19,6 +19,7 @@
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 
 #include "src/gpu/GrFragmentProcessor.h"
 

src/gpu/gl/GrGLProgram.cpp

@@ -12,6 +12,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/gl/GrGLBuffer.h"
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"

src/gpu/glsl/GrGLSLProgramBuilder.cpp

@@ -14,6 +14,7 @@
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"

src/gpu/mtl/GrMtlPipelineState.mm

@@ -10,6 +10,7 @@
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
 #include "src/gpu/glsl/GrGLSLXferProcessor.h"

src/gpu/ops/GrDefaultPathRenderer.cpp

@@ -23,6 +23,7 @@
 #include "src/gpu/GrSimpleMesh.h"
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrUtil.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/geometry/GrPathUtils.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"

src/gpu/ops/GrTextureOp.cpp

@@ -30,9 +30,11 @@
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrQuad.h"
 #include "src/gpu/geometry/GrQuadBuffer.h"
 #include "src/gpu/geometry/GrQuadUtils.h"
+#include "src/gpu/geometry/GrRect.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"

src/gpu/tessellate/GrTessellationPathRenderer.cpp

@@ -15,6 +15,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/GrVx.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/tessellate/GrAtlasRenderTask.h"
 #include "src/gpu/tessellate/GrDrawAtlasPathOp.h"

src/gpu/tessellate/shaders/GrPathTessellationShader.cpp

@@ -7,6 +7,8 @@
 
 #include "src/gpu/tessellate/shaders/GrPathTessellationShader.h"
 
+#include "src/gpu/effects/GrDisableColorXP.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
 
@@ -50,6 +52,25 @@ GrPathTessellationShader* GrPathTessellationShader::MakeSimpleTriangleShader(
     return arena->make<SimpleTriangleShader>(viewMatrix, color);
 }
 
+const GrPipeline* GrPathTessellationShader::MakeStencilOnlyPipeline(
+        const ProgramArgs& args,
+        GrAAType aaType,
+        GrTessellationPathRenderer::PathFlags pathFlags,
+        const GrAppliedHardClip& hardClip) {
+    using PathFlags = GrTessellationPathRenderer::PathFlags;
+    GrPipeline::InitArgs pipelineArgs;
+    if (aaType == GrAAType::kMSAA) {
+        pipelineArgs.fInputFlags |= GrPipeline::InputFlags::kHWAntialias;
+    }
+    if (args.fCaps->wireframeSupport() && (pathFlags & PathFlags::kWireframe)) {
+        pipelineArgs.fInputFlags |= GrPipeline::InputFlags::kWireframe;
+    }
+    pipelineArgs.fCaps = args.fCaps;
+    return args.fArena->make<GrPipeline>(pipelineArgs,
+                                            GrDisableColorXPFactory::MakeXferProcessor(),
+                                            hardClip);
+}
+
 // Evaluate our point of interest using numerically stable linear interpolations. We add our own
 // "safe_mix" method to guarantee we get exactly "b" when T=1. The builtin mix() function seems
 // spec'd to behave this way, but empirical results results have shown it does not always.

src/gpu/tessellate/shaders/GrPathTessellationShader.h

@@ -152,22 +152,10 @@ public:
     }
 
     // Creates a pipeline that does not write to the color buffer.
-    static const GrPipeline* MakeStencilOnlyPipeline(
+    static const GrPipeline* MakeStencilOnlyPipeline(const ProgramArgs&,
-            const ProgramArgs& args, GrAAType aaType,
+                                                     GrAAType,
-            GrTessellationPathRenderer::PathFlags pathFlags, const GrAppliedHardClip& hardClip) {
+                                                     GrTessellationPathRenderer::PathFlags,
-        using PathFlags = GrTessellationPathRenderer::PathFlags;
+                                                     const GrAppliedHardClip&);
-        GrPipeline::InitArgs pipelineArgs;
-        if (aaType == GrAAType::kMSAA) {
-            pipelineArgs.fInputFlags |= GrPipeline::InputFlags::kHWAntialias;
-        }
-        if (args.fCaps->wireframeSupport() && (pathFlags & PathFlags::kWireframe)) {
-            pipelineArgs.fInputFlags |= GrPipeline::InputFlags::kWireframe;
-        }
-        pipelineArgs.fCaps = args.fCaps;
-        return args.fArena->make<GrPipeline>(pipelineArgs,
-                                             GrDisableColorXPFactory::MakeXferProcessor(),
-                                             hardClip);
-    }
 
 protected:
     constexpr static size_t kMiddleOutVertexStride = 2 * sizeof(float);

src/gpu/v1/Device.cpp

@@ -39,6 +39,7 @@
 #include "src/gpu/GrSurfaceProxyPriv.h"
 #include "src/gpu/GrTracing.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrDisableColorXP.h"
 #include "src/gpu/effects/GrRRectEffect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/image/SkImage_Base.h"

src/gpu/v1/Device_drawTexture.cpp

@@ -24,6 +24,7 @@
 #include "src/gpu/effects/GrBicubicEffect.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 #include "src/gpu/effects/GrTextureEffect.h"
+#include "src/gpu/geometry/GrRect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/image/SkImage_Base.h"
 #include "src/image/SkImage_Gpu.h"

src/gpu/vk/GrVkOpsRenderPass.cpp

@@ -16,6 +16,7 @@
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/vk/GrVkAttachment.h"
 #include "src/gpu/vk/GrVkBuffer.h"
 #include "src/gpu/vk/GrVkCommandBuffer.h"

src/gpu/vk/GrVkPipelineState.cpp

@@ -11,6 +11,7 @@
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
 #include "src/gpu/glsl/GrGLSLXferProcessor.h"

src/image/SkImage_Gpu.cpp

@@ -38,6 +38,7 @@
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 #include "src/gpu/GrYUVATextureProxies.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/gl/GrGLTexture.h"
 
 #include <cstddef>

tests/BackendAllocationTest.cpp

@@ -14,6 +14,7 @@
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrSurfaceFillContext.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/image/SkImage_Base.h"
 #include "tests/Test.h"
 #include "tests/TestUtils.h"

tests/LazyProxyTest.cpp

@@ -22,6 +22,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrTextureProxyPriv.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/mock/GrMockGpu.h"
 
 // This test verifies that lazy proxy callbacks get invoked during flush, after onFlush callbacks,

tests/ProcessorTest.cpp

@@ -17,6 +17,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/ops/GrFillRectOp.h"

tests/ReadWritePixelsGpuTest.cpp

@@ -16,6 +16,7 @@
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "tests/Test.h"
 #include "tests/TestUtils.h"
 #include "tools/ToolUtils.h"

tests/RectangleTextureTest.cpp

@@ -14,6 +14,7 @@
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/SkGr.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #ifdef SK_GL
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/gl/GrGLUtil.h"

tests/SkSLCross.cpp

@@ -9,6 +9,7 @@
 
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 
 static void run_test(skiatest::Reporter*, GrDirectContext*,
                      GrSurfaceDrawContext*, SkVector a,