Store color and coverage stages in a single array in GrOptDrawState.

src/gpu/GrOptDrawState.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrOptDrawState_DEFINED
 #define GrOptDrawState_DEFINED
 
@@ skipping 101 matching lines @@
     /// pixel coverage rather than as input to the src/dst color blend step.
     ///
     /// The input color to the first color-stage is either the constant color or interpolated
     /// per-vertex colors. The input to the first coverage stage is either a constant coverage
     /// (usually full-coverage) or interpolated per-vertex coverage.
     ///
     /// See the documentation of kCoverageDrawing_StateBit for information about disabling the
     /// the color / coverage distinction.
     ////
 
-    int numColorStages() const { return fColorStages.count(); }
-    int numCoverageStages() const { return fCoverageStages.count(); }
+    int numColorStages() const { return fNumColorStages; }
+    int numCoverageStages() const { return fFragmentStages.count() - fNumColorStages; }
+    int numFragmentStages() const { return fFragmentStages.count(); }
     int numTotalStages() const {
-         return this->numColorStages() + this->numCoverageStages() +
-                 (this->hasGeometryProcessor() ? 1 : 0);
+         return this->numFragmentStages() + (this->hasGeometryProcessor() ? 1 : 0);
     }
 
     bool hasGeometryProcessor() const { return SkToBool(fGeometryProcessor.get()); }
     const GrGeometryStage* getGeometryProcessor() const { return fGeometryProcessor.get(); }
-    const GrFragmentStage& getColorStage(int idx) const { return fColorStages[idx]; }
-    const GrFragmentStage& getCoverageStage(int idx) const { return fCoverageStages[idx]; }
+    const GrFragmentStage& getColorStage(int idx) const {
+        SkASSERT(idx < this->numColorStages());
+        return fFragmentStages[idx];
+    }
+    const GrFragmentStage& getCoverageStage(int idx) const {
+        SkASSERT(idx < this->numCoverageStages());
+        return fFragmentStages[fNumColorStages + idx];
+    }
+    const GrFragmentStage& getFragmentStage(int idx) const { return fFragmentStages[idx]; }
 
     /// @}
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Blending
     ////
 
     GrBlendCoeff getSrcBlendCoeff() const { return fSrcBlend; }
     GrBlendCoeff getDstBlendCoeff() const { return fDstBlend; }
 
@@ skipping 285 matching lines @@
     int                                 fVACount;
     size_t                              fVAStride;
     GrStencilSettings                   fStencilSettings;
     uint8_t                             fCoverage;
     DrawFace                            fDrawFace;
     GrBlendCoeff                        fSrcBlend;
     GrBlendCoeff                        fDstBlend;
 
     typedef SkSTArray<8, GrFragmentStage> FragmentStageArray;
     SkAutoTDelete<GrGeometryStage>        fGeometryProcessor;
-    FragmentStageArray                    fColorStages;
-    FragmentStageArray                    fCoverageStages;
+    FragmentStageArray                    fFragmentStages;
+
+    // This function is equivalent to the offset into fFragmentStages where coverage stages begin.
+    int                                   fNumColorStages;
 
     // This is simply a different representation of info in fVertexAttribs and thus does
     // not need to be compared in op==.
     int fFixedFunctionVertexAttribIndices[kGrFixedFunctionVertexAttribBindingCnt];
 
     // These flags are needed to protect the code from creating an unused uniform color/coverage
     // which will cause shader compiler errors.
     bool            fInputColorIsUsed;
     bool            fInputCoverageIsUsed;
 
@@ skipping 10 matching lines @@
     PrimaryOutputType  fPrimaryOutputType : 8;
     SecondaryOutputType  fSecondaryOutputType : 8;
 
     typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrOptDrawState::BlendOptFlags);
 
 #endif