Make GrBatch carry its own GrPipeline

src/gpu/GrBufferedDrawTarget.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBufferedDrawTarget_DEFINED
 #define GrBufferedDrawTarget_DEFINED
 
@@ skipping 43 matching lines @@
                                                                SkChunkAlloc::kThrow_AllocFailType);
             SkASSERT(SkIsAlign4((uintptr_t)*xformsLocation));
             memcpy(*xformsLocation, transformValues, count * xformBytes);
         }
     }
 
 private:
     friend class GrInOrderCommandBuilder;
     friend class GrTargetCommands;
 
-    typedef GrTargetCommands::State State;
+    typedef GrTargetCommands::StateForPathDraw StateForPathDraw;
 
-    State* allocState(const GrPrimitiveProcessor* primProc = NULL) {
-        void* allocation = fPipelineBuffer.alloc(sizeof(State), SkChunkAlloc::kThrow_AllocFailType);
-        return SkNEW_PLACEMENT_ARGS(allocation, State, (primProc));
+    StateForPathDraw* allocState(const GrPrimitiveProcessor* primProc = NULL) {
+        void* allocation = fPipelineBuffer.alloc(sizeof(StateForPathDraw),
+                                                 SkChunkAlloc::kThrow_AllocFailType);
+        return SkNEW_PLACEMENT_ARGS(allocation, StateForPathDraw, (primProc));
     }
 
-    void unallocState(State* state) {
+    void unallocState(StateForPathDraw* state) {
         state->unref();
         fPipelineBuffer.unalloc(state);
     }
 
     void onReset() override;
     void onFlush() override;
 
     // overrides from GrDrawTarget
-    void onDrawBatch(GrBatch*, const PipelineInfo&) override;
+    void onDrawBatch(GrBatch*) override;
     void onStencilPath(const GrPipelineBuilder&,
                        const GrPathProcessor*,
                        const GrPath*,
                        const GrScissorState&,
                        const GrStencilSettings&) override;
     void onDrawPath(const GrPathProcessor*,
                     const GrPath*,
                     const GrStencilSettings&,
                     const PipelineInfo&) override;
     void onDrawPaths(const GrPathProcessor*,
@@ skipping 14 matching lines @@
                        const SkIPoint& dstPoint) override;
 
     // Records any trace markers for a command
     void recordTraceMarkersIfNecessary(GrTargetCommands::Cmd*);
     SkString getCmdString(int index) const {
         SkASSERT(index < fGpuCmdMarkers.count());
         return fGpuCmdMarkers[index].toString();
     }
     bool isIssued(uint32_t drawID) override { return drawID != fDrawID; }
 
-    State* SK_WARN_UNUSED_RESULT setupPipelineAndShouldDraw(const GrPrimitiveProcessor*,
-                                                            const GrDrawTarget::PipelineInfo&,
-                                                            GrPipelineOptimizations* opts);
-    State* SK_WARN_UNUSED_RESULT setupPipelineAndShouldDraw(GrBatch*,
-                                                            const GrDrawTarget::PipelineInfo&,
-                                                            GrPipelineOptimizations* opts);
+    StateForPathDraw* SK_WARN_UNUSED_RESULT createStateForPathDraw(
+        const GrPrimitiveProcessor*,
+        const GrDrawTarget::PipelineInfo&,
+        GrPipelineOptimizations* opts);
 
     // TODO: Use a single allocator for commands and records
     enum {
         kPathIdxBufferMinReserve     = 2 * 64,  // 64 uint16_t's
         kPathXformBufferMinReserve   = 2 * 64,  // 64 two-float transforms
-        kPipelineBufferMinReserve    = 32 * sizeof(State),
+        kPipelineBufferMinReserve    = 32 * sizeof(StateForPathDraw),
     };
 
     // every 100 flushes we should reset our fPipelineBuffer to prevent us from holding at a
     // highwater mark
     static const int kPipelineBufferHighWaterMark = 100;
 
     SkAutoTDelete<GrCommandBuilder>     fCommands;
     SkTArray<GrTraceMarkerSet, false>   fGpuCmdMarkers;
     SkChunkAlloc                        fPathIndexBuffer;
     SkChunkAlloc                        fPathTransformBuffer;
     SkChunkAlloc                        fPipelineBuffer;
     uint32_t                            fDrawID;
-    SkAutoTUnref<State>                 fPrevState;
+    SkAutoTUnref<StateForPathDraw>      fPrevState;
 
     typedef GrClipTarget INHERITED;
 };
 
 #endif