commit 71bd1ef2807ac2c9d3f82f93f1b958a57a7f612f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 12 20:42:26 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 12 20:42:26 2011 +0000
tree 89a04deadc51a91095d318e3883218ec121791b3
parent aa814fe4a148b05f9160a5f77cb4e630406ea62d

Don't update vertex/index buffer twice! 

Review URL: http://codereview.appspot.com/5483053/


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

src/gpu/GrBufferAllocPool.cpp

diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp
index c01192d..b06c3ad 100644
--- a/src/gpu/GrBufferAllocPool.cpp
+++ b/src/gpu/GrBufferAllocPool.cpp
@@ -320,14 +320,13 @@
     GrAssert(fCpuData.get() == fBufferPtr);
     GrAssert(flushSize <= buffer->sizeInBytes());
 
-    bool updated = false;
     if (fGpu->getCaps().fBufferLockSupport &&
         flushSize > GR_GEOM_BUFFER_LOCK_THRESHOLD) {
         void* data = buffer->lock();
         if (NULL != data) {
             memcpy(data, fBufferPtr, flushSize);
             buffer->unlock();
-            updated = true;
+            return;
         }
     }
     buffer->updateData(fBufferPtr, flushSize);