Refactor buffer existance check into Buffer::invalidateStaticData.

Change-Id: I28a7654d152865c236831636f00554a71784667b Reviewed-on: https://chromium-review.googlesource.com/184394Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Refactor buffer existance check into Buffer::invalidateStaticData.
f8912c50 · Geoff Lang · 826f3d30 · f8912c50
Commit f8912c50 authored Jan 30, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 18 deletions

Buffer.cpp src/libGLESv2/Buffer.cpp +9 -18

No files found.
--- a/src/libGLESv2/Buffer.cpp
+++ b/src/libGLESv2/Buffer.cpp
@@ -58,25 +58,13 @@ void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset)
 {
    mBufferStorage->setData(data, size, offset);
    mIndexRangeCache.invalidateRange(offset, size);
-
-    if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
-    {
-        invalidateStaticData();
-    }
-
-    mUnmodifiedDataUse = 0;
+    invalidateStaticData();
 }

 void Buffer::copyBufferSubData(Buffer* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size)
 {
    mBufferStorage->copyData(source->mBufferStorage, size, sourceOffset, destOffset);
-
-    if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
-    {
-        invalidateStaticData();
-    }
-
-    mUnmodifiedDataUse = 0;
+    invalidateStaticData();
 }

 rx::BufferStorage *Buffer::getStorage() const
@@ -106,11 +94,14 @@ rx::StaticIndexBufferInterface *Buffer::getStaticIndexBuffer()

 void Buffer::invalidateStaticData()
 {
-    delete mStaticVertexBuffer;
-    mStaticVertexBuffer = NULL;
+    if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
+    {
+        delete mStaticVertexBuffer;
+        mStaticVertexBuffer = NULL;

-    delete mStaticIndexBuffer;
-    mStaticIndexBuffer = NULL;
+        delete mStaticIndexBuffer;
+        mStaticIndexBuffer = NULL;
+    }

    mUnmodifiedDataUse = 0;
 }