Make GrBatch carry its own 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 11 matching lines @@
 class GrBatch;
 class GrDeviceCoordTexture;
 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:
+    struct CreateArgs {
+        const GrPipelineBuilder*    fPipelineBuilder;
+        const GrCaps*               fCaps;
+        GrProcOptInfo               fColorPOI;
+        GrProcOptInfo               fCoveragePOI;
+        const GrScissorState*       fScissor;
+        GrXferProcessor::DstTexture fDstTexture;
+    };
+
     /** Creates a pipeline into a pre-allocated buffer */
-    static GrPipeline* CreateAt(void* memory,
-                                const GrPipelineBuilder&,
-                                const GrProcOptInfo& colorPOI,
-                                const GrProcOptInfo& coveragePOI,
-                                const GrCaps&,
-                                const GrScissorState&,
-                                const GrXferProcessor::DstTexture*,
-                                GrPipelineOptimizations*);
+    static GrPipeline* CreateAt(void* memory, const CreateArgs&, 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 29 matching lines @@
      */
     GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
 
     const GrStencilSettings& getStencil() const { return fStencilSettings; }
 
     const GrScissorState& getScissorState() const { return fScissorState; }
 
     bool isDitherState() const { return SkToBool(fFlags & kDither_Flag); }
     bool isHWAntialiasState() const { return SkToBool(fFlags & kHWAA_Flag); }
     bool snapVerticesToPixelCenters() const { return SkToBool(fFlags & kSnapVertices_Flag); }
-    // Skip any draws that refer to this pipeline (they should be a no-op).
-    bool mustSkip() const { return NULL == this->getRenderTarget(); }
 
     /**
      * Gets whether the target is drawing clockwise, counterclockwise,
      * or both faces.
      * @return the current draw face(s).
      */
     GrPipelineBuilder::DrawFace getDrawFace() const { return fDrawFace; }
 
 
     ///////////////////////////////////////////////////////////////////////////
@@ skipping 46 matching lines @@
     // 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