Start using GrGpuCommandBuffer in GrDrawTarget.

src/gpu/batches/GrBatch.h

Index: src/gpu/batches/GrBatch.h
diff --git a/src/gpu/batches/GrBatch.h b/src/gpu/batches/GrBatch.h
index f0559330feb82db2764b1e444858d0d08ba3b13c..46b1cbd8e620cc240869818b3e15007932592650 100644
--- a/src/gpu/batches/GrBatch.h
+++ b/src/gpu/batches/GrBatch.h
@@ -16,6 +16,7 @@
 #include <new>
 
 class GrCaps;
+class GrGpuCommandBuffer;
 class GrBatchFlushState;
 class GrRenderTarget;
 
@@ -110,7 +111,7 @@ public:
     void prepare(GrBatchFlushState* state) { this->onPrepare(state); }
 
     /** Issues the batches commands to GrGpu. */
-    void draw(GrBatchFlushState* state) { this->onDraw(state); }
+    void draw(GrBatchFlushState* state, GrGpuCommandBuffer* buffer) { this->onDraw(state, buffer); }

[bsalomon, 2016/06/20 16:51:14]

Could buffer be on the state?

[egdaniel, 2016/06/22 15:26:57]

Done.

 
     /** Used to block batching across render target changes. Remove this once we store
         GrBatches for different RTs in different targets. */
@@ -139,7 +140,7 @@ private:
     virtual bool onCombineIfPossible(GrBatch*, const GrCaps& caps) = 0;
 
     virtual void onPrepare(GrBatchFlushState*) = 0;
-    virtual void onDraw(GrBatchFlushState*) = 0;
+    virtual void onDraw(GrBatchFlushState*, GrGpuCommandBuffer*) = 0;
 
     static uint32_t GenID(int32_t* idCounter) {
         // The atomic inc returns the old value not the incremented value. So we add