Simplify installation of pipeling into GrDrawBatch in GrDrawTarget.h

src/gpu/GrDrawTarget.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
@@ skipping 159 matching lines @@
                      const SkIRect& srcRect,
                      const SkIPoint& dstPoint);
     /**
      * Release any resources that are cached but not currently in use. This
      * is intended to give an application some recourse when resources are low.
      */
     virtual void purgeResources() {};
 
     bool programUnitTest(GrContext* owner, int maxStages);
 
-    struct PipelineInfo {
-        PipelineInfo(const GrPipelineBuilder* pipelineBuilder, const GrScissorState* scissor,
-                     const GrDrawBatch* batch, const SkRect* devBounds,
-                     GrDrawTarget* target);
-
-        bool valid() const { return SkToBool(fArgs.fPipelineBuilder); }
-
-        const GrPipeline::CreateArgs& pipelineCreateArgs() const {
-            SkASSERT(this->valid());
-            return fArgs;
-        }
-
-    private:
-        GrPipeline::CreateArgs      fArgs;
-    };
-
 protected:
     GrGpu* getGpu() { return fGpu; }
     const GrGpu* getGpu() const { return fGpu; }
 
-    // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
-    // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
-    // needs to be accessed by GLPrograms to setup a correct drawstate
-    bool setupDstReadIfNecessary(const GrPipelineBuilder&,
-                                 const GrProcOptInfo& colorPOI,
-                                 const GrProcOptInfo& coveragePOI,
-                                 GrXferProcessor::DstTexture*,
-                                 const SkRect* drawBounds);
-
     void recordBatch(GrBatch*);
 
 private:
     SkSTArray<256, SkAutoTUnref<GrBatch>, true> fBatches;
 
+    bool installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
+                                    const GrScissorState* scissor,
+                                    GrDrawBatch* batch);
+
+    // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
+    // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
+    // needs to be accessed by GLPrograms to setup a correct drawstate
+    bool setupDstReadIfNecessary(const GrPipelineBuilder&,
+        const GrProcOptInfo& colorPOI,
+        const GrProcOptInfo& coveragePOI,
+        GrXferProcessor::DstTexture*,
+        const SkRect& batchBounds);
+
     void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch,
                        GrPathRendering::FillType fill);
     // Check to see if this set of draw commands has been sent out
     void getPathStencilSettingsForFilltype(GrPathRendering::FillType,
                                            const GrStencilAttachment*,
                                            GrStencilSettings*);
     virtual GrClipMaskManager* clipMaskManager() = 0;
     virtual bool setupClip(const GrPipelineBuilder&,
                            GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                            GrPipelineBuilder::AutoRestoreStencil*,
@@ skipping 46 matching lines @@
     bool setupClip(const GrPipelineBuilder&,
                    GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                    GrPipelineBuilder::AutoRestoreStencil*,
                    GrScissorState* scissorState,
                    const SkRect* devBounds) override;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif