Start using GrGpuCommandBuffer in GrDrawTarget.

src/gpu/batches/GrCopySurfaceBatch.h

Index: src/gpu/batches/GrCopySurfaceBatch.h
diff --git a/src/gpu/batches/GrCopySurfaceBatch.h b/src/gpu/batches/GrCopySurfaceBatch.h
index 3926643f8aedff441e2c36aece565a267c3d9ba8..d0269b79bf8c795494f551edf39d0b21e91bcd4d 100644
--- a/src/gpu/batches/GrCopySurfaceBatch.h
+++ b/src/gpu/batches/GrCopySurfaceBatch.h
@@ -36,7 +36,7 @@ public:
         GrRenderTarget* rt = fDst.get()->asRenderTarget();
         return rt ? rt->getUniqueID() : 0;
     }
-    GrRenderTarget* renderTarget() const override { return fDst.get()->asRenderTarget(); }
+    GrRenderTarget* renderTarget() const override { return nullptr; }

[jvanverth1, 2016/06/17 15:25:16]

It's not clear to me why this is okay.

[egdaniel, 2016/06/17 15:57:35]

Before my change, this call was only called by drawBatches for drawing the
bounding rectangle around a batch. So changing this has no side effect (outside
of not drawing bounds around a copy which we can live with). I then use this
function as a trigger of whether to use a command buffer or not in the
individual batch draw calls.

This really needs Robs MDB changes to clean it up nicely since he has special
handling of copies which I believe will not be part of the normal drawTargets. 

[jvanverth1, 2016/06/17 16:49:13]

Just so I understand: so if renderTarget() returns nullptr you don't use a
command buffer, right?

[egdaniel, 2016/06/17 17:06:49]

Yes

 
     SkString dumpInfo() const override {
         SkString string;
@@ -63,8 +63,13 @@ private:
 
     void onPrepare(GrBatchFlushState*) override {}
 
-    void onDraw(GrBatchFlushState* state) override {
-        state->gpu()->copySurface(fDst.get(), fSrc.get(), fSrcRect, fDstPoint);
+    void onDraw(GrBatchFlushState* state, GrGpuCommandBuffer* buffer) override {
+        if (!buffer) {
+            state->gpu()->copySurface(fDst.get(), fSrc.get(), fSrcRect, fDstPoint);
+        } else {
+            // currently we are not sending copies through the GrGpuCommandBuffer

[jvanverth1, 2016/06/17 15:25:16]

Does this mean that copies will be performed immediately on Vulkan? Is that
safe?

[egdaniel, 2016/06/17 15:57:35]

Yes it is safe. Since the renderTarget above returns nullptr, it will trigger us
to end the current command buffer we are writing to and submit it. Thus this
gets inlined in the correct place.

[jvanverth1, 2016/06/17 16:49:13]

Acknowledged.

+            SkASSERT(false);
+        }
     }
 
     GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;