Disable preemptive batch preparation

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 18 matching lines @@
 #include "batches/GrStencilPathBatch.h"
 
 #include "SkStrokeRec.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 GrDrawTarget::GrDrawTarget(GrRenderTarget* rt, GrGpu* gpu, GrResourceProvider* resourceProvider,
                            const Options& options)
     : fGpu(SkRef(gpu))
     , fResourceProvider(resourceProvider)
-    , fFlushState(fGpu, fResourceProvider, 0)
+    , fFlushState(fGpu, fResourceProvider)
     , fFlushing(false)
-    , fFirstUnpreparedBatch(0)
     , fFlags(0)
     , fOptions(options)
     , fRenderTarget(rt) {
     // TODO: Stop extracting the context (currently needed by GrClipMaskManager)
     fContext = fGpu->getContext();
     fClipMaskManager.reset(new GrClipMaskManager(this));
 
 #ifdef SK_DEBUG
     static int debugID = 0;
     fDebugID = debugID++;
@@ skipping 131 matching lines @@
     }
     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 the batches that haven't yet generated their geometry
-    for (; fFirstUnpreparedBatch < fBatches.count(); ++fFirstUnpreparedBatch) {
-        fBatches[fFirstUnpreparedBatch]->prepare(&fFlushState);
+    for (int i = 0; i < fBatches.count(); ++i) {
+        fBatches[i]->prepare(&fFlushState);
     }
 
     // Upload all data to the GPU
     fFlushState.preIssueDraws();
 
     // Draw all the generated geometry.
     for (int i = 0; i < fBatches.count(); ++i) {
         fBatches[i]->draw(&fFlushState);
     }
 
     SkASSERT(fFlushState.lastFlushedToken() == fFlushState.currentToken());
     this->reset();
 
     fFlushing = false;
 }
 
 void GrDrawTarget::reset() {
-    fFirstUnpreparedBatch = 0;
     fBatches.reset();
     fFlushState.reset();
 }
 
 void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawBatch* batch) {
     // Setup clip
     GrPipelineBuilder::AutoRestoreStencil ars;
     GrAppliedClip clip;
     if (!fClipMaskManager->setupClipping(pipelineBuilder, &ars, &batch->bounds(), &clip)) {
         return;
@@ skipping 292 matching lines @@
             ++i;
             if (i == maxCandidates) {
                 GrBATCH_INFO("\t\tReached max lookback or beginning of batch array %d\n", i);
                 break;
             }
         }
     } else {
         GrBATCH_INFO("\t\tFirstBatch\n");
     }
     fBatches.push_back().reset(SkRef(batch));
-    if (fBatches.count() > kMaxLookback) {
-        SkASSERT(fBatches.count() - kMaxLookback - fFirstUnpreparedBatch == 1);
-        fBatches[fFirstUnpreparedBatch++]->prepare(&fFlushState);
-    }
     if (fOptions.fImmediateMode) {
         this->flush();
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool GrDrawTarget::installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
                                               const GrAppliedClip* clip, GrDrawBatch* batch) {
     GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
@@ skipping 19 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();
 }