aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-06-29 13:43:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-29 13:43:23 -0700
commit27fe1f849d2b6f96b49cc919df7d5f6d74598aa1 (patch)
tree00c467944004e5af9752ed9fd7f6cebccc026135
parent67f62fae59e982f221d29e2bd0a89a72eaf486bc (diff)
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
-rw-r--r--src/gpu/GrDrawingManager.cpp8
1 files 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<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();