Remove GrStagedProcessor, remove the word Stage as it applies to FPs

Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7 Review URL: https://codereview.chromium.org/1307223004
zstang · Aug 27, 2015 · ac856c9 · ac856c9
1 parent a04c650
commit ac856c9
Show file tree

Hide file tree

Showing 44 changed files with 322 additions and 364 deletions.
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
@@ -77,7 +77,7 @@ class BigRRectAAEffectGM : public GM {
                     SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType, rrect));
                     SkASSERT(fp);
                     if (fp) {
-                        pipelineBuilder.addCoverageProcessor(fp);
+                        pipelineBuilder.addCoverageFragmentProcessor(fp);
                         pipelineBuilder.setRenderTarget(rt);
 
                         SkRect bounds = SkRect::MakeWH(SkIntToScalar(kMaxSize),

diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
@@ -113,7 +113,7 @@ class ConstColorProcessor : public GM {
 
                     GrClip clip;
                     GrPipelineBuilder pipelineBuilder(grPaint, rt, clip);
-                    pipelineBuilder.addColorProcessor(fp);
+                    pipelineBuilder.addColorFragmentProcessor(fp);
 
                     tt.target()->drawNonAARect(pipelineBuilder,
                                                grPaint.getColor(),

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
@@ -191,7 +191,7 @@ class ConvexPolyEffect : public GM {
                 }
 
                 GrPipelineBuilder pipelineBuilder;
-                pipelineBuilder.addCoverageProcessor(fp);
+                pipelineBuilder.addCoverageFragmentProcessor(fp);
                 pipelineBuilder.setRenderTarget(rt);
 
                 ConvexPolyTestBatch::Geometry geometry;
@@ -240,7 +240,7 @@ class ConvexPolyEffect : public GM {
                 }
 
                 GrPipelineBuilder pipelineBuilder;
-                pipelineBuilder.addCoverageProcessor(fp);
+                pipelineBuilder.addCoverageFragmentProcessor(fp);
                 pipelineBuilder.setRenderTarget(rt);
 
                 ConvexPolyTestBatch::Geometry geometry;

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
@@ -114,7 +114,7 @@ class RRectGM : public GM {
                         SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType,
                                                                                    rrect));
                         if (fp) {
-                            pipelineBuilder.addCoverageProcessor(fp);
+                            pipelineBuilder.addCoverageFragmentProcessor(fp);
                             pipelineBuilder.setRenderTarget(rt);
 
                             SkRect bounds = rrect.getBounds();

diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
@@ -128,7 +128,7 @@ class TextureDomainEffect : public GM {
                     }
                     const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y);
                     pipelineBuilder.setRenderTarget(rt);
-                    pipelineBuilder.addColorProcessor(fp);
+                    pipelineBuilder.addColorFragmentProcessor(fp);
 
                     tt.target()->drawNonAARect(pipelineBuilder,
                                                GrColor_WHITE,

diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
@@ -123,7 +123,7 @@ class YUVtoRGBEffect : public GM {
                     SkMatrix viewMatrix;
                     viewMatrix.setTranslate(x, y);
                     pipelineBuilder.setRenderTarget(rt);
-                    pipelineBuilder.addColorProcessor(fp);
+                    pipelineBuilder.addColorFragmentProcessor(fp);
                     tt.target()->drawNonAARect(pipelineBuilder,
                                                GrColor_WHITE,
                                                viewMatrix,

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
@@ -35,7 +35,6 @@
       '<(skia_include_path)/gpu/GrRenderTarget.h',
       '<(skia_include_path)/gpu/GrResourceKey.h',
       '<(skia_include_path)/gpu/GrShaderVar.h',
-      '<(skia_include_path)/gpu/GrStagedProcessor.h',
       '<(skia_include_path)/gpu/GrSurface.h',
       '<(skia_include_path)/gpu/GrTexture.h',
       '<(skia_include_path)/gpu/GrTextureProvider.h',
@@ -149,7 +148,6 @@
       '<(skia_src_path)/gpu/GrPathUtils.cpp',
       '<(skia_src_path)/gpu/GrPathUtils.h',
       '<(skia_src_path)/gpu/GrPendingProgramElement.h',
-      '<(skia_src_path)/gpu/GrPendingFragmentStage.h',
       '<(skia_src_path)/gpu/GrPipeline.cpp',
       '<(skia_src_path)/gpu/GrPipeline.h',
       '<(skia_src_path)/gpu/GrPipelineBuilder.cpp',

diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h
@@ -9,7 +9,6 @@
 #define GrFragmentProcessor_DEFINED
 
 #include "GrProcessor.h"
-#include "GrStagedProcessor.h"
 
 class GrCoordTransform;
 class GrGLSLCaps;
@@ -29,12 +28,14 @@ class GrFragmentProcessor : public GrProcessor {
         , fNumTexturesExclChildren(0)
         , fNumTransformsExclChildren(0) {}
 
+    ~GrFragmentProcessor() override;
+
     GrGLFragmentProcessor* createGLInstance() const;
 
     void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
         this->onGetGLProcessorKey(caps, b);
         for (int i = 0; i < fChildProcessors.count(); ++i) {
-            fChildProcessors[i].processor()->getGLProcessorKey(caps, b);
+            fChildProcessors[i]->getGLProcessorKey(caps, b);
         }
     }
 
@@ -60,9 +61,7 @@ class GrFragmentProcessor : public GrProcessor {
 
     int numChildProcessors() const { return fChildProcessors.count(); }
 
-    const GrFragmentProcessor& childProcessor(int index) const {
-        return *fChildProcessors[index].processor();
-    }
+    const GrFragmentProcessor& childProcessor(int index) const { return *fChildProcessors[index]; }
 
     /** Do any of the coordtransforms for this processor require local coords? */
     bool usesLocalCoords() const { return fUsesLocalCoords; }
@@ -176,7 +175,9 @@ class GrFragmentProcessor : public GrProcessor {
     int                                          fNumTexturesExclChildren;
     int                                          fNumTransformsExclChildren;
 
-    SkTArray<GrFragmentStage, false>             fChildProcessors;
+    // TODO: These must convert their processors to pending-execution refs when the parent is
+    // converted (do this automatically in GrProgramElement?).
+    SkTArray<const GrFragmentProcessor*, true>   fChildProcessors;
 
     typedef GrProcessor INHERITED;
 };

diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
@@ -11,7 +11,6 @@
 #define GrPaint_DEFINED
 
 #include "GrColor.h"
-#include "GrStagedProcessor.h"
 #include "GrProcessorDataManager.h"
 #include "GrXferProcessor.h"
 #include "effects/GrPorterDuffXferProcessor.h"
@@ -44,7 +43,7 @@ class GrPaint {
 
     GrPaint(const GrPaint& paint) { *this = paint; }
 
-    ~GrPaint() {}
+    ~GrPaint() { this->resetFragmentProcessors();  }
 
     /**
      * The initial color of the drawn primitive. Defaults to solid white.
@@ -78,18 +77,18 @@ class GrPaint {
     /**
      * Appends an additional color processor to the color computation.
      */
-    const GrFragmentProcessor* addColorProcessor(const GrFragmentProcessor* fp) {
+    const GrFragmentProcessor* addColorFragmentProcessor(const GrFragmentProcessor* fp) {
         SkASSERT(fp);
-        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrFragmentStage, (fp));
+        fColorFragmentProcessors.push_back(SkRef(fp));
         return fp;
     }
 
     /**
      * Appends an additional coverage processor to the coverage computation.
      */
-    const GrFragmentProcessor* addCoverageProcessor(const GrFragmentProcessor* fp) {
+    const GrFragmentProcessor* addCoverageFragmentProcessor(const GrFragmentProcessor* fp) {
         SkASSERT(fp);
-        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrFragmentStage, (fp));
+        fCoverageFragmentProcessors.push_back(SkRef(fp));
         return fp;
     }
 
@@ -102,9 +101,10 @@ class GrPaint {
     void addColorTextureProcessor(GrTexture*, const SkMatrix&, const GrTextureParams&);
     void addCoverageTextureProcessor(GrTexture*, const SkMatrix&, const GrTextureParams&);
 
-    int numColorStages() const { return fColorStages.count(); }
-    int numCoverageStages() const { return fCoverageStages.count(); }
-    int numTotalStages() const { return this->numColorStages() + this->numCoverageStages(); }
+    int numColorFragmentProcessors() const { return fColorFragmentProcessors.count(); }
+    int numCoverageFragmentProcessors() const { return fCoverageFragmentProcessors.count(); }
+    int numTotalFragmentProcessors() const { return this->numColorFragmentProcessors() +
+                                              this->numCoverageFragmentProcessors(); }
 
     const GrXPFactory* getXPFactory() const {
         if (!fXPFactory) {
@@ -113,17 +113,27 @@ class GrPaint {
         return fXPFactory.get();
     }
 
-    const GrFragmentStage& getColorStage(int s) const { return fColorStages[s]; }
-    const GrFragmentStage& getCoverageStage(int s) const { return fCoverageStages[s]; }
+    const GrFragmentProcessor* getColorFragmentProcessor(int i) const {
+        return fColorFragmentProcessors[i];
+    }
+    const GrFragmentProcessor* getCoverageFragmentProcessor(int i) const {
+        return fCoverageFragmentProcessors[i];
+    }
 
     GrPaint& operator=(const GrPaint& paint) {
         fAntiAlias = paint.fAntiAlias;
         fDither = paint.fDither;
 
         fColor = paint.fColor;
-
-        fColorStages = paint.fColorStages;
-        fCoverageStages = paint.fCoverageStages;
+        this->resetFragmentProcessors();
+        fColorFragmentProcessors = paint.fColorFragmentProcessors;
+        fCoverageFragmentProcessors = paint.fCoverageFragmentProcessors;
+        for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
+            fColorFragmentProcessors[i]->ref();
+        }
+        for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
+            fCoverageFragmentProcessors[i]->ref();
+        }
 
         fXPFactory.reset(SkRef(paint.getXPFactory()));
         fProcDataManager.reset(new GrProcessorDataManager(*paint.processorDataManager()));
@@ -144,15 +154,26 @@ class GrPaint {
     const GrProcessorDataManager* processorDataManager() const { return fProcDataManager.get(); }
 
 private:
-    mutable SkAutoTUnref<const GrXPFactory> fXPFactory;
-    SkSTArray<4, GrFragmentStage>        fColorStages;
-    SkSTArray<2, GrFragmentStage>        fCoverageStages;
+    void resetFragmentProcessors() {
+        for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
+            fColorFragmentProcessors[i]->unref();
+        }
+        for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
+            fCoverageFragmentProcessors[i]->unref();
+        }
+        fColorFragmentProcessors.reset();
+        fCoverageFragmentProcessors.reset();
+    }
+
+    mutable SkAutoTUnref<const GrXPFactory>         fXPFactory;
+    SkSTArray<4, const GrFragmentProcessor*, true>  fColorFragmentProcessors;
+    SkSTArray<2, const GrFragmentProcessor*, true>  fCoverageFragmentProcessors;
 
-    bool                                 fAntiAlias;
-    bool                                 fDither;
+    bool                                            fAntiAlias;
+    bool                                            fDither;
 
-    GrColor                              fColor;
-    SkAutoTUnref<GrProcessorDataManager> fProcDataManager;
+    GrColor                                         fColor;
+    SkAutoTUnref<GrProcessorDataManager>            fProcDataManager;
 };
 
 #endif
diff --git a/include/gpu/GrStagedProcessor.h b/include/gpu/GrStagedProcessor.h
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
@@ -352,7 +352,7 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Cont
     GrPaint paint;
     if (this->asFragmentProcessor(&fp, paint.getProcessorDataManager(), srcTexture, matrix, bounds)) {
         SkASSERT(fp);
-        paint.addColorProcessor(fp)->unref();
+        paint.addColorFragmentProcessor(fp)->unref();
 
         GrDrawContext* drawContext = context->drawContext();
         if (drawContext) {

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
@@ -859,7 +859,7 @@ bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrTextureProvider* texProvider,
         return false;
     }
 
-    grp->addCoverageProcessor(fp);
+    grp->addCoverageFragmentProcessor(fp);
 
     SkMatrix inverse;
     if (!viewMatrix.invert(&inverse)) {
@@ -1135,7 +1135,7 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrTextureProvider* texProvid
         return false;
     }
 
-    grp->addCoverageProcessor(fp);
+    grp->addCoverageFragmentProcessor(fp);
 
     SkMatrix inverse;
     if (!viewMatrix.invert(&inverse)) {
@@ -1211,8 +1211,8 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src,
         SkMatrix matrix;
         matrix.setIDiv(src->width(), src->height());
         // Blend pathTexture over blurTexture.
-        paint.addCoverageProcessor(GrSimpleTextureEffect::Create(paint.getProcessorDataManager(),
-                                                                 src, matrix))->unref();
+        paint.addCoverageFragmentProcessor(
+            GrSimpleTextureEffect::Create(paint.getProcessorDataManager(), src, matrix))->unref();
         if (kInner_SkBlurStyle == fBlurStyle) {
             // inner:  dst = dst * src
             paint.setCoverageSetOpXPFactory(SkRegion::kIntersect_Op);

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
@@ -438,7 +438,7 @@ bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src,
     offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displacementOffset.fX),
                               SkIntToScalar(colorOffset.fY - displacementOffset.fY));
 
-    paint.addColorProcessor(
+    paint.addColorFragmentProcessor(
         GrDisplacementMapEffect::Create(paint.getProcessorDataManager(),
                                         fXChannelSelector,
                                         fYChannelSelector,

diff --git a/src/effects/SkGpuBlurUtils.cpp b/src/effects/SkGpuBlurUtils.cpp
@@ -59,7 +59,7 @@ static void convolve_gaussian_1d(GrDrawContext* drawContext,
     GrPaint paint;
     SkAutoTUnref<GrFragmentProcessor> conv(GrConvolutionEffect::CreateGaussian(
         paint.getProcessorDataManager(), texture, direction, radius, sigma, useBounds, bounds));
-    paint.addColorProcessor(conv);
+    paint.addColorFragmentProcessor(conv);
     drawContext->drawNonAARectToRect(rt, clip, paint, SkMatrix::I(), dstRect, srcRect);
 }
 
@@ -83,7 +83,7 @@ static void convolve_gaussian_2d(GrDrawContext* drawContext,
             texture, bounds, size, 1.0, 0.0, kernelOffset,
             useBounds ? GrTextureDomain::kClamp_Mode : GrTextureDomain::kIgnore_Mode,
             true, sigmaX, sigmaY));
-    paint.addColorProcessor(conv);
+    paint.addColorFragmentProcessor(conv);
     drawContext->drawNonAARectToRect(rt, clip, paint, SkMatrix::I(), dstRect, srcRect);
 }
 
@@ -216,7 +216,7 @@ GrTexture* GaussianBlur(GrContext* context,
                 domain,
                 GrTextureDomain::kDecal_Mode,
                 GrTextureParams::kBilerp_FilterMode));
-            paint.addColorProcessor(fp);
+            paint.addColorFragmentProcessor(fp);
         } else {
             GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode);
             paint.addColorTextureProcessor(srcTexture, matrix, params);

diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
@@ -354,7 +354,7 @@ void SkLightingImageFilterInternal::drawRect(GrDrawContext* drawContext,
     GrPaint paint;
     GrFragmentProcessor* fp = this->getFragmentProcessor(paint.getProcessorDataManager(), src,
                                                          matrix, bounds, boundaryMode);
-    paint.addColorProcessor(fp)->unref();
+    paint.addColorFragmentProcessor(fp)->unref();
     drawContext->drawNonAARectToRect(dst->asRenderTarget(), clip, paint, SkMatrix::I(),
                                      dstRect, srcRect);
 }