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()); |