Minor GrContext/GrInOrderDrawBuffer cleanup

src/gpu/GrInOrderDrawBuffer.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrInOrderDrawBuffer.h"
@@ skipping 427 matching lines @@
     fStates.reset();
     fClears.reset();
     fVertexPool.reset();
     fIndexPool.reset();
     fClips.reset();
     fClipOrigins.reset();
     fCopySurfaces.reset();
     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 the top of the function if
we're flushing.

 
     GrAutoTRestore<bool> flushRestore(&fFlushing);
     fFlushing = true;
 
     fVertexPool.unlock();
     fIndexPool.unlock();
 
     GrDrawTarget::AutoClipRestore acr(fDstGpu);
     AutoGeometryAndStatePush agasp(fDstGpu, kPreserve_ASRInit);
 
@@ skipping 59 matching lines @@
     GrAssert(fStates.count() == currState);
     GrAssert(fClips.count() == currClip);
     GrAssert(fClipOrigins.count() == currClip);
     GrAssert(fClears.count() == currClear);
     GrAssert(fDraws.count()  == currDraw);
     GrAssert(fCopySurfaces.count() == currCopySurface);
 
     fDstGpu->setDrawState(prevDrawState);
     prevDrawState->unref();
     this->reset();
-    return true;
 }
 
 bool GrInOrderDrawBuffer::onCopySurface(GrSurface* dst,
                                         GrSurface* src,
                                         const SkIRect& srcRect,
                                         const SkIPoint& dstPoint) {
     if (fDstGpu->canCopySurface(dst, src, srcRect, dstPoint)) {
         CopySurface* cs = this->recordCopySurface();
         cs->fDst.reset(SkRef(dst));
         cs->fSrc.reset(SkRef(src));
@@ skipping 269 matching lines @@
     fCmds.push_back(kCopySurface_Cmd);
     return &fCopySurfaces.push_back();
 }
 
 
 void GrInOrderDrawBuffer::clipWillBeSet(const GrClipData* newClipData) {
     INHERITED::clipWillBeSet(newClipData);
     fClipSet = true;
     fClipProxyState = kUnknown_ClipProxyState;
 }