Update testing frameworks/tests for MDB

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"
 #include "GrDrawTarget.h"
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
 #include "GrStencilAndCoverTextContext.h"
 #include "SkTTopoSort.h"
 
-//#define ENABLE_MDB 1
 
 void GrDrawingManager::cleanup() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->makeClosed();  // no drawTarget should receive a new command after this
+        fDrawTargets[i]->clearRT();
+
         fDrawTargets[i]->unref();
     }
 
     fDrawTargets.reset();
 
     delete fNVPRTextContext;
     fNVPRTextContext = nullptr;
 
     for (int i = 0; i < kNumPixelGeometries; ++i) {
         delete fTextContexts[i][0];
@@ skipping 47 matching lines @@
 
     // 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());
 
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->reset();
+#ifdef ENABLE_MDB
+        fDrawTargets[i]->unref();
+#endif
+    }
+
 #ifndef ENABLE_MDB
     // When MDB is disabled we keep reusing the same drawTarget
     if (fDrawTargets.count()) {
         SkASSERT(fDrawTargets.count() == 1);
+        // Clear out this flag so the topological sort's SkTTopoSort_CheckAllUnmarked check
+        // won't bark
         fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
     }
+#else
+    fDrawTargets.reset();
 #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);
@@ skipping 18 matching lines @@
     return fTextContexts[props.pixelGeometry()][useDIF];
 }
 
 GrDrawTarget* GrDrawingManager::newDrawTarget(GrRenderTarget* rt) {
     SkASSERT(fContext);
 
 #ifndef ENABLE_MDB
     // When MDB is disabled we always just return the single drawTarget
     if (fDrawTargets.count()) {
         SkASSERT(fDrawTargets.count() == 1);
+        // In the non-MDB-world the same drawTarget gets reused for multiple render targets.
+        // Update this pointer so all the asserts are happy
+        rt->setLastDrawTarget(fDrawTargets[0]);
         // 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());
 
     *fDrawTargets.append() = dt;
 
     // DrawingManager gets the creation ref - this ref is for the caller 
@@ skipping 27 matching lines @@
 }
 
 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
                                              const SkSurfaceProps* surfaceProps) {
     if (this->abandoned()) {
         return nullptr;
     }
 
     return new GrDrawContext(this, rt, surfaceProps);
 }