From 27fe1f849d2b6f96b49cc919df7d5f6d74598aa1 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 29 Jun 2016 13:43:22 -0700 Subject: [PATCH] Move dump of batches to be after the forwardCombine call in prepareBatches 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index f0a9a161c8..458bd20571 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -67,6 +67,10 @@ void GrDrawingManager::flush() { SkTTopoSort(&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();