Chromium Code Reviews| Index: src/gpu/GrInOrderDrawBuffer.cpp |
| =================================================================== |
| --- src/gpu/GrInOrderDrawBuffer.cpp (revision 9893) |
| +++ src/gpu/GrInOrderDrawBuffer.cpp (working copy) |
| @@ -445,15 +445,18 @@ |
| fClipSet = true; |
| } |
| -bool GrInOrderDrawBuffer::flush() { |
| +void GrInOrderDrawBuffer::flush() { |
| + if (fFlushing) { |
| + return; |
| + } |
| + |
| GrAssert(kReserved_GeometrySrcType != this->getGeomSrc().fVertexSrc); |
| GrAssert(kReserved_GeometrySrcType != this->getGeomSrc().fIndexSrc); |
| int numCmds = fCmds.count(); |
| if (0 == numCmds) { |
| - return false; |
| + return; |
| } |
| - GrAssert(!fFlushing); |
|
bsalomon
2013/07/03 18:34:21
Is this assertion no longer valid?
robertphillips
2013/07/03 18:37:45
It shouldn't ever fire since we are returning at t
|
| GrAutoTRestore<bool> flushRestore(&fFlushing); |
| fFlushing = true; |
| @@ -533,7 +536,6 @@ |
| fDstGpu->setDrawState(prevDrawState); |
| prevDrawState->unref(); |
| this->reset(); |
| - return true; |
| } |
| bool GrInOrderDrawBuffer::onCopySurface(GrSurface* dst, |