Move dump of batches to be after the forwardCombine call in prepareBatches
authorrobertphillips <robertphillips@google.com>
Wed, 29 Jun 2016 20:43:22 +0000 (13:43 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 29 Jun 2016 20:43:23 +0000 (13:43 -0700)
This eliminates an unfortunate red herring. Text batching isn't actually as bad as I had feared.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2110123003

Review-Url: https://codereview.chromium.org/2110123003

src/gpu/GrDrawingManager.cpp

index f0a9a161c8e8ea103614cd51055fe2914a915a07..458bd20571fafc332fff5cb2bd66accd1bde31f9 100644 (file)
@@ -67,6 +67,10 @@ void GrDrawingManager::flush() {
                         SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>(&fDrawTargets);
     SkASSERT(result);
 
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->prepareBatches(&fFlushState);
+    }
+
     // Enable this to print out verbose batching information
 #if 0
     for (int i = 0; i < fDrawTargets.count(); ++i) {
@@ -74,10 +78,6 @@ void GrDrawingManager::flush() {
     }
 #endif
 
-    for (int i = 0; i < fDrawTargets.count(); ++i) {
-        fDrawTargets[i]->prepareBatches(&fFlushState);
-    }
-
     // Upload all data to the GPU
     fFlushState.preIssueDraws();