Move GrBatchFlushState from GrDrawTarget to GrDrawingManager

src/gpu/GrDrawingManager.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlasTextContext.h"
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
@@ skipping 40 matching lines @@
     // a path renderer may be holding onto resources
     delete fPathRendererChain;
     fPathRendererChain = nullptr;
     SkSafeSetNull(fSoftwarePathRenderer);
 }
 
 void GrDrawingManager::reset() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->reset();
     }
+    fFlushState.reset();
 }
 
 void GrDrawingManager::flush() {
     SkDEBUGCODE(bool result =) 
                         SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>(&fDrawTargets);
     SkASSERT(result);
 
+#if 0
     for (int i = 0; i < fDrawTargets.count(); ++i) {
-        //SkDEBUGCODE(fDrawTargets[i]->dump();)
-        fDrawTargets[i]->flush();
+        SkDEBUGCODE(fDrawTargets[i]->dump();)
     }
+#endif
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->prepareBatches(&fFlushState);
+    }
+
+    // Upload all data to the GPU
+    fFlushState.preIssueDraws();
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->drawBatches(&fFlushState);
+    }
+
+    SkASSERT(fFlushState.lastFlushedToken() == fFlushState.currentToken());
 
 #ifndef ENABLE_MDB
     // When MDB is disabled we keep reusing the same drawTarget
     if (fDrawTargets.count()) {
         SkASSERT(fDrawTargets.count() == 1);
         fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
     }
 #endif
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->reset();
+    }
+    fFlushState.reset();
 }
 
 GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props,
                                              GrRenderTarget* rt) {
     if (this->abandoned()) {
         return nullptr;
     }
 
     SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
     bool useDIF = props.isUseDeviceIndependentFonts();
@@ skipping 22 matching lines @@
 
 #ifndef ENABLE_MDB
     // When MDB is disabled we always just return the single drawTarget
     if (fDrawTargets.count()) {
         SkASSERT(fDrawTargets.count() == 1);
         // DrawingManager gets the creation ref - this ref is for the caller
         return SkRef(fDrawTargets[0]);
     }
 #endif
 
-    GrDrawTarget* dt = new GrDrawTarget(rt, fContext->getGpu(), fContext->resourceProvider(),
-                                        fOptions);
+    GrDrawTarget* dt = new GrDrawTarget(rt, fContext->getGpu(), fContext->resourceProvider());
 
     *fDrawTargets.append() = dt;
 
     // DrawingManager gets the creation ref - this ref is for the caller 
     return SkRef(dt);
 }
 
 /*
  * This method finds a path renderer that can draw the specified path on
  * the provided target.
@@ skipping 21 matching lines @@
 }
 
 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
                                              const SkSurfaceProps* surfaceProps) {
     if (this->abandoned()) {
         return nullptr;
     }
 
     return new GrDrawContext(this, rt, surfaceProps);
 }