Skip to content

A
angle
Commit f8912c50 by Geoff Lang
Options

Refactor buffer existance check into Buffer::invalidateStaticData.

Change-Id: I28a7654d152865c236831636f00554a71784667b Reviewed-on: https://chromium-review.googlesource.com/184394Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 826f3d30
Showing with 9 additions and 18 deletions
src/libGLESv2/Buffer.cpp
...@@ -58,25 +58,13 @@ void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset) ...@@ -58,25 +58,13 @@ void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset)
{ {
mBufferStorage->setData(data, size, offset); mBufferStorage->setData(data, size, offset);
mIndexRangeCache.invalidateRange(offset, size); mIndexRangeCache.invalidateRange(offset, size);
invalidateStaticData();
if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
{
invalidateStaticData();
}
mUnmodifiedDataUse = 0;
} }
void Buffer::copyBufferSubData(Buffer* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size) void Buffer::copyBufferSubData(Buffer* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size)
{ {
mBufferStorage->copyData(source->mBufferStorage, size, sourceOffset, destOffset); mBufferStorage->copyData(source->mBufferStorage, size, sourceOffset, destOffset);
invalidateStaticData();
if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
{
invalidateStaticData();
}
mUnmodifiedDataUse = 0;
} }
rx::BufferStorage *Buffer::getStorage() const rx::BufferStorage *Buffer::getStorage() const
...@@ -106,11 +94,14 @@ rx::StaticIndexBufferInterface *Buffer::getStaticIndexBuffer() ...@@ -106,11 +94,14 @@ rx::StaticIndexBufferInterface *Buffer::getStaticIndexBuffer()
void Buffer::invalidateStaticData() void Buffer::invalidateStaticData()
{ {
delete mStaticVertexBuffer; if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0))
mStaticVertexBuffer = NULL; {
delete mStaticVertexBuffer;
mStaticVertexBuffer = NULL;
delete mStaticIndexBuffer; delete mStaticIndexBuffer;
mStaticIndexBuffer = NULL; mStaticIndexBuffer = NULL;
}
mUnmodifiedDataUse = 0; mUnmodifiedDataUse = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment