Start using GrGpuCommandBuffer in GrDrawTarget.

src/gpu/GrDrawTarget.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawTarget.h"
 
 #include "GrAuditTrail.h"
 #include "GrCaps.h"
 #include "GrDrawContext.h"
 #include "GrGpu.h"
+#include "GrGpuCommandBuffer.h"
 #include "GrPath.h"
 #include "GrPipeline.h"
 #include "GrMemoryPool.h"
 #include "GrRenderTarget.h"
 #include "GrResourceProvider.h"
 #include "GrRenderTargetPriv.h"
 #include "GrStencilAttachment.h"
 #include "GrSurfacePriv.h"
 #include "GrTexture.h"
 #include "gl/GrGLRenderTarget.h"
@@ skipping 178 matching lines @@
     for (int i = 0; i < fBatches.count(); ++i) {
         if (fBatches[i]) {
             fBatches[i]->prepare(flushState);
         }
     }
 }
 
 void GrDrawTarget::drawBatches(GrBatchFlushState* flushState) {
     // Draw all the generated geometry.
     SkRandom random;
+    GrRenderTarget* currentRT = nullptr;
+    SkAutoTDelete<GrGpuCommandBuffer> commandBuffer;
     for (int i = 0; i < fBatches.count(); ++i) {
         if (!fBatches[i]) {
             continue;
         }
+        if (fBatches[i]->renderTarget() != currentRT) {
+            if (commandBuffer) {
+                commandBuffer->end();
+                // For now just use size of whole render target, but this should be updated to
+                // only be the actual bounds of the various draws.
+                SkIRect bounds = SkIRect::MakeWH(currentRT->width(), currentRT->height());
+                commandBuffer->submit(bounds);
+                commandBuffer.reset();
+            }
+            currentRT = fBatches[i]->renderTarget();
+            if (currentRT) {
+                static const GrGpuCommandBuffer::LoadAndStoreInfo kBasicLoadStoreInfo =

[bsalomon, 2016/06/23 02:12:55]

A slightly more terse version of this would be:

static const GrGpuCommandBuffer::LoadAndStoreInfo kBasicLoadStoreInfo
    { GrGpuCommandBuffer::kLoad_LoadOp, GrGpuCommandBuffer::kStore_StoreOp };

[egdaniel, 2016/06/23 13:57:08]

Done.

+                    GrGpuCommandBuffer::LoadAndStoreInfo(GrGpuCommandBuffer::kLoad_LoadOp,
+                                                         GrGpuCommandBuffer::kStore_StoreOp);
+                commandBuffer.reset(fGpu->createCommandBuffer(currentRT,
+                                                              kBasicLoadStoreInfo,   // Color
+                                                              kBasicLoadStoreInfo)); // Stencil
+            }
+            flushState->setCommandBuffer(commandBuffer);
+        }
         if (fDrawBatchBounds) {
             const SkRect& bounds = fBatches[i]->bounds();
             SkIRect ibounds;
             bounds.roundOut(&ibounds);
             // In multi-draw buffer all the batches use the same render target and we won't need to
             // get the batchs bounds.
             if (GrRenderTarget* rt = fBatches[i]->renderTarget()) {
                 fGpu->drawDebugWireRect(rt, ibounds, 0xFF000000 | random.nextU());
             }
         }
         fBatches[i]->draw(flushState);
     }
+    if (commandBuffer) {
+        commandBuffer->end();
+        // For now just use size of whole render target, but this should be updated to
+        // only be the actual bounds of the various draws.
+        SkIRect bounds = SkIRect::MakeWH(currentRT->width(), currentRT->height());
+        commandBuffer->submit(bounds);
+        flushState->setCommandBuffer(nullptr);
+    }
 
     fGpu->finishDrawTarget();
 }
 
 void GrDrawTarget::reset() {
     fBatches.reset();
 }
 
 void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder,
                              GrDrawContext* drawContext,
@@ skipping 286 matching lines @@
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void GrDrawTarget::clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* rt) {
     GrBatch* batch = new GrClearStencilClipBatch(rect, insideClip, rt);
     this->recordBatch(batch);
     batch->unref();
 }