Loosen requirement that there be only one 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"
 
@@ skipping 19 matching lines @@
 
 #include "SkStrokeRec.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 GrDrawTarget::GrDrawTarget(GrGpu* gpu, GrResourceProvider* resourceProvider)
     : fGpu(SkRef(gpu))
     , fResourceProvider(resourceProvider)
     , fFlushState(fGpu, fResourceProvider, 0)
     , fFlushing(false)
-    , fFirstUnpreparedBatch(0) {
+    , fFirstUnpreparedBatch(0)
+    , fClosed(false) {
     // TODO: Stop extracting the context (currently needed by GrClipMaskManager)
     fContext = fGpu->getContext();
     fClipMaskManager.reset(new GrClipMaskManager(this));
 }
 
 GrDrawTarget::~GrDrawTarget() {
     fGpu->unref();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 60 matching lines @@
     dstTexture->setOffset(copyRect.fLeft, copyRect.fTop);
     return true;
 }
 
 void GrDrawTarget::flush() {
     if (fFlushing) {
         return;
     }
     fFlushing = true;
 
+    // Semi-usually the drawTargets are already closed at this point, but sometimes Ganesh
+    // needs to flush mid-draw. In that case, the SkGpuDevice's drawTargets won't be closed
+    // but need to be flushed anyway. Closing such drawTargets here will mean new
+    // drawTargets will be created to replace them if the SkGpuDevice(s) write to them again.
+    this->makeClosed();
+
     // Loop over all batches and generate geometry
     for (; fFirstUnpreparedBatch < fBatches.count(); ++fFirstUnpreparedBatch) {
         fBatches[fFirstUnpreparedBatch]->prepare(&fFlushState);
     }
 
     // Upload all data to the GPU
     fFlushState.preIssueDraws();
 
     // Draw all the generated geometry.
     for (int i = 0; i < fBatches.count(); ++i) {
@@ skipping 268 matching lines @@
     }
 }
 
 template <class Left, class Right> static bool intersect(const Left& a, const Right& b) {
     SkASSERT(a.fLeft <= a.fRight && a.fTop <= a.fBottom &&
              b.fLeft <= b.fRight && b.fTop <= b.fBottom);
     return a.fLeft < b.fRight && b.fLeft < a.fRight && a.fTop < b.fBottom && b.fTop < a.fBottom;
 }
 
 void GrDrawTarget::recordBatch(GrBatch* batch) {
+    // A closed drawTarget should never receive new/more batches
+    SkASSERT(!fClosed);
+
     // Check if there is a Batch Draw we can batch with by linearly searching back until we either
     // 1) check every draw
     // 2) intersect with something
     // 3) find a 'blocker'
     // Experimentally we have found that most batching occurs within the first 10 comparisons.
     static const int kMaxLookback = 10;
 
     GrBATCH_INFO("Re-Recording (%s, B%u)\n"
         "\tBounds LRTB (%f, %f, %f, %f)\n",
         batch->name(),
@@ skipping 62 matching lines @@
     }
 
     return true;
 }
 
 void GrDrawTarget::clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* rt) {
     GrBatch* batch = new GrClearStencilClipBatch(rect, insideClip, rt);
     this->recordBatch(batch);
     batch->unref();
 }