commit 1267fbd95290f58443652ca8d947bde50b212618
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 03 18:37:27 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 03 18:37:27 2013 +0000
tree 64919cb1d59b80d0e0fbce6ebd646b90bee36ba9
parent 34b73a2da18f9c1ee01ca716a2e5a4ea0fa3ace4

Minor GrContext/GrInOrderDrawBuffer cleanup

https://codereview.chromium.org/18341007/



git-svn-id: http://skia.googlecode.com/svn/trunk@9898 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrInOrderDrawBuffer.cpp

diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 18b70dc..dde66c5 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -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);
 
     GrAutoTRestore<bool> flushRestore(&fFlushing);
     fFlushing = true;
@@ -533,7 +536,6 @@
     fDstGpu->setDrawState(prevDrawState);
     prevDrawState->unref();
     this->reset();
-    return true;
 }
 
 bool GrInOrderDrawBuffer::onCopySurface(GrSurface* dst,