diff options
author | bsalomon <bsalomon@google.com> | 2016-04-01 06:06:20 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-01 06:06:20 -0700 |
commit | 342bfc25de5b0452b1551bf9db4bf45eac7718b2 (patch) | |
tree | 5d54f2ecb1ec17f7848500df30c4f6d40c5b9ae8 /src/gpu/GrDrawingManager.cpp | |
parent | 38d68bc31d69ea9793d925dd3c7d4337330b2b7b (diff) |
Simplify GrDrawBatch uploads and token uage.
GrVertexBatch subclasses no longer need "initDraw".
Simplifies GrTestBatch
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1835283002
Review URL: https://codereview.chromium.org/1835283002
Diffstat (limited to 'src/gpu/GrDrawingManager.cpp')
-rw-r--r-- | src/gpu/GrDrawingManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 6efc286e73..976fbb62a4 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -84,7 +84,7 @@ void GrDrawingManager::flush() { fDrawTargets[i]->drawBatches(&fFlushState); } - SkASSERT(fFlushState.lastFlushedToken() == fFlushState.currentToken()); + SkASSERT(fFlushState.nextDrawToken() == fFlushState.nextTokenToFlush()); for (int i = 0; i < fDrawTargets.count(); ++i) { fDrawTargets[i]->reset(); |