commit 1f0e350af690044b2ba807893ac470800f8914a2
author robertphillips <robertphillips@google.com> Tue Nov 10 10:19:50 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Nov 10 10:19:51 2015 -0800
tree 1b025de40930d6aa37829a12bc07a82cd9b43208
parent 80ec3dbf72b596bb00e6f9ded211fd6ac7729b9b

Disable preemptive batch preparation

Preemptive batch preparation makes MultiDrawBuffer more difficult to implement. This CL disables it.

BUG=skia:4094

Review URL: https://codereview.chromium.org/1430403002

src/gpu/GrBatchFlushState.cpp

diff --git a/src/gpu/GrBatchFlushState.cpp b/src/gpu/GrBatchFlushState.cpp
index f120666..52261a1 100644
--- a/src/gpu/GrBatchFlushState.cpp
+++ b/src/gpu/GrBatchFlushState.cpp
@@ -10,15 +10,14 @@
 #include "GrBatchAtlas.h"
 #include "GrPipeline.h"
 
-GrBatchFlushState::GrBatchFlushState(GrGpu* gpu, GrResourceProvider* resourceProvider,
-                                     GrBatchToken lastFlushedToken)
+GrBatchFlushState::GrBatchFlushState(GrGpu* gpu, GrResourceProvider* resourceProvider)
     : fGpu(gpu)
     , fUploader(gpu)
     , fResourceProvider(resourceProvider)
     , fVertexPool(gpu)
     , fIndexPool(gpu)
-    , fCurrentToken(lastFlushedToken)
-    , fLastFlushedToken(lastFlushedToken) {}
+    , fCurrentToken(0)
+    , fLastFlushedToken(0) {}
 
 void* GrBatchFlushState::makeVertexSpace(size_t vertexSize, int vertexCount,
                                          const GrVertexBuffer** buffer, int* startVertex) {