Make GrPaint have a variable sized array of color and coverage stages rather than a fixed size.

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 25 matching lines @@
  * of the destination pixel, labeled Bs and Bd respectively. The final value of the destination
  * pixel is then D' = (1-C)*D + C*(Bd*D + Bs*S).
  *
  * Note that the coverage is applied after the blend. This is why they are computed as distinct
  * values.
  *
  * TODO: Encapsulate setXfermodeColorFilter in a GrEffect and remove from GrPaint.
  */
 class GrPaint {
 public:
-    enum {
-        kMaxColorStages     = 3,
-        kMaxCoverageStages  = 1,
-    };
-
     GrPaint() { this->reset(); }
 
     GrPaint(const GrPaint& paint) { *this = paint; }
 
     ~GrPaint() {}
 
     /**
      * Sets the blending coefficients to use to blend the final primitive color with the
      * destination color. Defaults to kOne for src and kZero for dst (i.e. src mode).
      */
@@ skipping 43 matching lines @@
 
     /**
      * Disables the SkXfermode::Mode color filter.
      */
     void resetColorFilter() {
         fColorFilterXfermode = SkXfermode::kDst_Mode;
         fColorFilterColor = GrColorPackRGBA(0xff, 0xff, 0xff, 0xff);
     }
 
     /**
-     * Specifies a stage of the color pipeline. Usually the texture matrices of color stages apply
-     * to the primitive's positions. Some GrContext calls take explicit coords as an array or a
-     * rect. In this case these are the pre-matrix coords to colorStage(0).
+     * Appends an additional color effect to the color computation.
      */
-    GrEffectStage* colorStage(int i) {
-        GrAssert((unsigned)i < kMaxColorStages);
-        return fColorStages + i;
-    }
-
-    const GrEffectStage& getColorStage(int i) const {
-        GrAssert((unsigned)i < kMaxColorStages);
-        return fColorStages[i];
-    }
-
-    bool isColorStageEnabled(int i) const {
-        GrAssert((unsigned)i < kMaxColorStages);
-        return (NULL != fColorStages[i].getEffect());
+    const GrEffectRef* addColorEffect(const GrEffectRef* effect, int attr0 = -1, int attr1 = -1) {
+        GrAssert(NULL != effect);
+        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
+        return effect;
     }
 
     /**
-     * Specifies a stage of the coverage pipeline. Coverage stages' texture matrices are always
-     * applied to the primitive's position, never to explicit texture coords.
+     * Appends an additional coverage effect to the coverage computation.
      */
-    GrEffectStage* coverageStage(int i) {
-        GrAssert((unsigned)i < kMaxCoverageStages);
-        return fCoverageStages + i;
+    const GrEffectRef* addCoverageEffect(const GrEffectRef* effect, int attr0 = -1, int attr1 = -1) {
+        GrAssert(NULL != effect);
+        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
+        return effect;
     }
 
-    const GrEffectStage& getCoverageStage(int i) const {
-        GrAssert((unsigned)i < kMaxCoverageStages);
-        return fCoverageStages[i];
-    }
+    /**
+     * Helpers for adding color or coverage effects that sample a texture. The matrix is applied
+     * to the src space position to compute texture coordinates.
+     */
+    void addColorTextureEffect(GrTexture* texture, const SkMatrix& matrix);
+    void addCoverageTextureEffect(GrTexture* texture, const SkMatrix& matrix);
 
-    bool isCoverageStageEnabled(int i) const {
-        GrAssert((unsigned)i < kMaxCoverageStages);
-        return (NULL != fCoverageStages[i].getEffect());
-    }
+    void addColorTextureEffect(GrTexture* texture,
+                               const SkMatrix& matrix,
+                               const GrTextureParams& params);
+    void addCoverageTextureEffect(GrTexture* texture,
+                                  const SkMatrix& matrix,
+                                  const GrTextureParams& params);
 
-    bool hasCoverageStage() const {
-        for (int i = 0; i < kMaxCoverageStages; ++i) {
-            if (this->isCoverageStageEnabled(i)) {
-                return true;
-            }
-        }
-        return false;
-    }
+    int numColorStages() const { return fColorStages.count(); }
+    int numCoverageStages() const { return fCoverageStages.count(); }
+    int numTotalStages() const { return this->numColorStages() + this->numCoverageStages(); }
 
-    bool hasColorStage() const {
-        for (int i = 0; i < kMaxColorStages; ++i) {
-            if (this->isColorStageEnabled(i)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool hasStage() const { return this->hasColorStage() || this->hasCoverageStage(); }
+    const GrEffectStage& getColorStage(int s) const { return fColorStages[s]; }
+    const GrEffectStage& getCoverageStage(int s) const { return fCoverageStages[s]; }
 
     GrPaint& operator=(const GrPaint& paint) {
         fSrcBlendCoeff = paint.fSrcBlendCoeff;
         fDstBlendCoeff = paint.fDstBlendCoeff;
         fAntiAlias = paint.fAntiAlias;
         fDither = paint.fDither;
 
         fColor = paint.fColor;
         fCoverage = paint.fCoverage;
 
         fColorFilterColor = paint.fColorFilterColor;
         fColorFilterXfermode = paint.fColorFilterXfermode;
 
-        for (int i = 0; i < kMaxColorStages; ++i) {
-            if (paint.isColorStageEnabled(i)) {
-                fColorStages[i] = paint.fColorStages[i];
-            }
-        }
-        for (int i = 0; i < kMaxCoverageStages; ++i) {
-            if (paint.isCoverageStageEnabled(i)) {
-                fCoverageStages[i] = paint.fCoverageStages[i];
-            }
-        }
+        fColorStages = paint.fColorStages;
+        fCoverageStages = paint.fCoverageStages;
+
         return *this;
     }
 
     /**
      * Resets the paint to the defaults.
      */
     void reset() {
         this->resetBlend();
         this->resetOptions();
         this->resetColor();
         this->resetCoverage();
         this->resetStages();
         this->resetColorFilter();
     }
 
-    // internal use
-    // GrPaint's textures and masks map to the first N stages
-    // of GrDrawTarget in that order (textures followed by masks)
-    enum {
-        kFirstColorStage = 0,
-        kFirstCoverageStage = kMaxColorStages,
-        kTotalStages = kFirstColorStage + kMaxColorStages + kMaxCoverageStages,
-    };
-
 private:
     /**
      * Called when the source coord system from which geometry is rendered changes. It ensures that
      * the local coordinates seen by effects remains unchanged. oldToNew gives the transformation
      * from the previous coord system to the new coord system.
      */
     void localCoordChange(const SkMatrix& oldToNew) {
-        for (int i = 0; i < kMaxColorStages; ++i) {
-            if (this->isColorStageEnabled(i)) {
-                fColorStages[i].localCoordChange(oldToNew);
-            }
+        for (int i = 0; i < fColorStages.count(); ++i) {
+            fColorStages[i].localCoordChange(oldToNew);
         }
-        for (int i = 0; i < kMaxCoverageStages; ++i) {
-            if (this->isCoverageStageEnabled(i)) {
-                fCoverageStages[i].localCoordChange(oldToNew);
-            }
+        for (int i = 0; i < fCoverageStages.count(); ++i) {
+            fCoverageStages[i].localCoordChange(oldToNew);
         }
     }
 
     bool localCoordChangeInverse(const SkMatrix& newToOld) {
         SkMatrix oldToNew;
         bool computed = false;
-        for (int i = 0; i < kMaxColorStages; ++i) {
-            if (this->isColorStageEnabled(i)) {
-                if (!computed && !newToOld.invert(&oldToNew)) {
-                    return false;
-                } else {
-                    computed = true;
-                }
-                fColorStages[i].localCoordChange(oldToNew);
+        for (int i = 0; i < fColorStages.count(); ++i) {
+            if (!computed && !newToOld.invert(&oldToNew)) {
+                return false;
+            } else {
+                computed = true;
             }
+            fColorStages[i].localCoordChange(oldToNew);
         }
-        for (int i = 0; i < kMaxCoverageStages; ++i) {
-            if (this->isCoverageStageEnabled(i)) {
-                if (!computed && !newToOld.invert(&oldToNew)) {
-                    return false;
-                } else {
-                    computed = true;
-                }
-                fCoverageStages[i].localCoordChange(oldToNew);
+        for (int i = 0; i < fCoverageStages.count(); ++i) {
+            if (!computed && !newToOld.invert(&oldToNew)) {
+                return false;
+            } else {
+                computed = true;
             }
+            fCoverageStages[i].localCoordChange(oldToNew);
         }
         return true;
     }
 
     friend class GrContext; // To access above two functions
 
-    GrEffectStage               fColorStages[kMaxColorStages];
-    GrEffectStage               fCoverageStages[kMaxCoverageStages];
+    SkSTArray<4, GrEffectStage> fColorStages;
+    SkSTArray<2, GrEffectStage> fCoverageStages;
 
     GrBlendCoeff                fSrcBlendCoeff;
     GrBlendCoeff                fDstBlendCoeff;
     bool                        fAntiAlias;
     bool                        fDither;
 
     GrColor                     fColor;
     uint8_t                     fCoverage;
 
     GrColor                     fColorFilterColor;
@@ skipping 11 matching lines @@
 
     void resetColor() {
         fColor = GrColorPackRGBA(0xff, 0xff, 0xff, 0xff);
     }
 
     void resetCoverage() {
         fCoverage = 0xff;
     }
 
     void resetStages() {
-        for (int i = 0; i < kMaxColorStages; ++i) {
-            fColorStages[i].reset();
-        }
-        for (int i = 0; i < kMaxCoverageStages; ++i) {
-            fCoverageStages[i].reset();
-        }
+        fColorStages.reset();
+        fCoverageStages.reset();
     }
 };
 
 #endif