Delay copying effects from DS or ODS till end of creating ODS

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 361 matching lines @@
                    const GrDrawTargetCaps& caps);
 
     /**
      * Loops through all the color stage effects to check if the stage will ignore color input or
      * always output a constant color. In the ignore color input case we can ignore all previous
      * stages. In the constant color case, we can ignore all previous stages and
      * the current one and set the state color to the constant color. Once we determine the so
      * called first effective stage, we copy all the effective stages into our optimized
      * state.
      */
-    void copyEffectiveColorStages(const GrDrawState& ds);
+    void computeEffectiveColorStages(const GrDrawState& ds);
 
     /**
      * Loops through all the coverage stage effects to check if the stage will ignore color input.
      * If a coverage stage will ignore input, then we can ignore all coverage stages before it. We
      * loop to determine the first effective coverage stage, and then copy all of our effective
      * coverage stages into our optimized state.
      */
-    void copyEffectiveCoverageStages(const GrDrawState& ds);
+    void computeEffectiveCoverageStages(const GrDrawState& ds);
 
     /**
-     * This function takes in a flag and removes the corresponding fixed function vertex attributes.
-     * The flags are in the same order as GrVertexAttribBinding array. If bit i of removeVAFlags is
-     * set, then vertex attributes with binding (GrVertexAttribute)i will be removed.
+     * This function reads in the fFixedFunctionVAToRemove flag and removes the corresponding fixed
+     * function vertex attributes. The flags are in the same order as GrVertexAttribBinding array.
+     * If bit i of fFixedFunctionVAToRemove is set, then vertex attributes with binding
+     * (GrVertexAttribute)i will be removed.
      */
-    void removeFixedFunctionVertexAttribs(uint8_t removeVAFlags);
+    void removeFixedFunctionVertexAttribs();
 
     /**
      * Alter the OptDrawState (adjusting stages, vertex attribs, flags, etc.) based on the
      * BlendOptFlags.
      */
-    void adjustFromBlendOpts();
+    void adjustFromBlendOpts(const GrDrawState& ds);
 
     /**
      * Loop over the effect stages to determine various info like what data they will read and what
      * shaders they require.
      */
-    void getStageStats();
+    void getStageStats(const GrDrawState& ds);
 
     /**
      * Calculates the primary and secondary output types of the shader. For certain output types
      * the function may adjust the blend coefficients. After this function is called the src and dst
      * blend coeffs will represent those used by backend API.
      */
-    void setOutputStateInfo(const GrDrawTargetCaps&);
+    void setOutputStateInfo(const GrDrawState& ds, const GrDrawTargetCaps&);
 
     bool isEqual(const GrOptDrawState& that) const;
 
     // These fields are roughly sorted by decreasing likelihood of being different in op==
     typedef GrTGpuResourceRef<GrRenderTarget> ProgramRenderTarget;
     ProgramRenderTarget                 fRenderTarget;
     GrColor                             fColor;
     SkMatrix                            fViewMatrix;
     GrColor                             fBlendConstant;
     uint32_t                            fFlagBits;
     const GrVertexAttrib*               fVAPtr;
     int                                 fVACount;
     size_t                              fVAStride;
     GrStencilSettings                   fStencilSettings;
     uint8_t                             fCoverage;
     DrawFace                            fDrawFace;
     GrBlendCoeff                        fSrcBlend;
     GrBlendCoeff                        fDstBlend;
 
-    typedef SkSTArray<4, GrFragmentStage> FragmentStageArray;
+    typedef SkSTArray<8, GrFragmentStage> FragmentStageArray;
     SkAutoTDelete<GrGeometryStage>        fGeometryProcessor;
     FragmentStageArray                    fColorStages;
     FragmentStageArray                    fCoverageStages;
 
+    // Used when creating an OptDrawState from a DrawState to keep track of which stages to copy

[bsalomon, 2014/10/07 20:20:42]

Do these really belong as members? Seems like they should be in a stack object
in Create that goes away when the ODS is finished construction.

[egdaniel, 2014/10/07 21:10:06]

Done.

+    // from the DS to the ODS.
+    int                                   fFirstColorStageIdx;
+    int                                   fFirstCoverageStageIdx;
+    bool                                  fSeparateCoverageFromColor;
+
+    uint8_t                               fFixedFunctionVAToRemove;
+
     // 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;
 
     // These flags give aggregated info on the effect stages that are used when building programs.
     bool            fReadsDst;
     bool            fReadsFragPosition;
     bool            fRequiresLocalCoordAttrib;
 
     SkAutoSTArray<4, GrVertexAttrib> fOptVA;
 
     BlendOptFlags   fBlendOptFlags;
 
     // Fragment shader color outputs
     PrimaryOutputType  fPrimaryOutputType : 8;
     SecondaryOutputType  fSecondaryOutputType : 8;
 
     typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrOptDrawState::BlendOptFlags);
 
 #endif