Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: src/gpu/GrContext.cpp

Issue 18341007: Minor GrContext/GrInOrderDrawBuffer cleanup (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/GrContext.cpp
===================================================================
--- src/gpu/GrContext.cpp (revision 9893)
+++ src/gpu/GrContext.cpp (working copy)
@@ -1134,17 +1134,6 @@
if (kDiscard_FlushBit & flagsBitfield) {
fDrawBuffer->reset();
} else {
- this->flushDrawBuffer();
- }
- // TODO: Remove this flag
- if (kForceCurrentRenderTarget_FlushBit & flagsBitfield) {
- fGpu->drawState()->setRenderTarget(this->getRenderTarget());
- fGpu->forceRenderTargetFlush();
- }
-}
-
-void GrContext::flushDrawBuffer() {
- if (NULL != fDrawBuffer && !fDrawBuffer->isFlushing()) {
fDrawBuffer->flush();
}
}
@@ -1560,7 +1549,7 @@
GrAssert(0 == fDrawState->numColorStages() && 0 == fDrawState->numCoverageStages());
if (kNo_BufferedDraw == buffered && kYes_BufferedDraw == fLastDrawWasBuffered) {
- this->flushDrawBuffer();
+ fDrawBuffer->flush();
fLastDrawWasBuffered = kNo_BufferedDraw;
}
ASSERT_OWNED_RESOURCE(fRenderTarget.get());

Powered by Google App Engine
This is Rietveld 408576698