Remove GrPipelineOptimizations member from GrPipeline

src/gpu/GrPipeline.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPipeline_DEFINED
 #define GrPipeline_DEFINED
 
@@ skipping 13 matching lines @@
 class GrPipelineBuilder;
 
 /**
  * Class that holds an optimized version of a GrPipelineBuilder. It is meant to be an immutable
  * class, and contains all data needed to set the state for a gpu draw.
  */
 class GrPipeline : public GrNonAtomicRef {
 public:
     /** Creates a pipeline into a pre-allocated buffer */
     static GrPipeline* CreateAt(void* memory,
-                                const GrPipelineBuilder& pb,
+                                const GrPipelineBuilder&,
                                 const GrProcOptInfo& colorPOI,
                                 const GrProcOptInfo& coveragePOI,
-                                const GrCaps& caps,
-                                const GrScissorState& scissor,
-                                const GrXferProcessor::DstTexture* dst) {
-        return SkNEW_PLACEMENT_ARGS(memory, GrPipeline, (pb, colorPOI, coveragePOI, caps, scissor,
-                                                         dst));
-    }
+                                const GrCaps&,
+                                const GrScissorState&,
+                                const GrXferProcessor::DstTexture*,
+                                GrPipelineOptimizations*);
 
     /*
      * Returns true if these pipelines are equivalent.  Coord transforms may be applied either on
      * the GPU or the CPU. When we apply them on the CPU then the matrices need not agree in order
      * to combine draws. Therefore we take a param that indicates whether coord transforms should be
      * compared."
      */
     bool isEqual(const GrPipeline& that, bool ignoreCoordTransforms = false) const;
 
     /// @}
@@ skipping 44 matching lines @@
      * or both faces.
      * @return the current draw face(s).
      */
     GrPipelineBuilder::DrawFace getDrawFace() const { return fDrawFace; }
 
 
     ///////////////////////////////////////////////////////////////////////////
 
     bool readsFragPosition() const { return fReadsFragPosition; }
 
-    const GrPipelineOptimizations& infoForPrimitiveProcessor() const {
-        return fInfoForPrimitiveProcessor;
-    }
-
     const SkTArray<const GrCoordTransform*, true>& coordTransforms() const {
         return fCoordTransforms;
     }
 
 private:
-    GrPipeline(const GrPipelineBuilder&,
-               const GrProcOptInfo& colorPOI,
-               const GrProcOptInfo& coveragePOI,
-               const GrCaps&,
-               const GrScissorState&,
-               const GrXferProcessor::DstTexture*);
+    GrPipeline() { /** Initialized in factory function*/ }
 
     /**
      * Alter the program desc and inputs (attribs and processors) based on the blend optimization.
      */
     void adjustProgramFromOptimizations(const GrPipelineBuilder& ds,
                                         GrXferProcessor::OptFlags,
                                         const GrProcOptInfo& colorPOI,
                                         const GrProcOptInfo& coveragePOI,
                                         int* firstColorStageIdx,
                                         int* firstCoverageStageIdx);
@@ skipping 16 matching lines @@
     typedef SkSTArray<8, GrPendingFragmentStage> FragmentStageArray;
     typedef GrPendingProgramElement<const GrXferProcessor> ProgramXferProcessor;
     RenderTarget                        fRenderTarget;
     GrScissorState                      fScissorState;
     GrStencilSettings                   fStencilSettings;
     GrPipelineBuilder::DrawFace         fDrawFace;
     uint32_t                            fFlags;
     ProgramXferProcessor                fXferProcessor;
     FragmentStageArray                  fFragmentStages;
     bool                                fReadsFragPosition;
-    GrPipelineOptimizations                      fInfoForPrimitiveProcessor;
 
     // This function is equivalent to the offset into fFragmentStages where coverage stages begin.
     int                                 fNumColorStages;
 
     SkSTArray<8, const GrCoordTransform*, true> fCoordTransforms;
     GrProgramDesc                       fDesc;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif