Refactoring Buffers
BUG=angle:681
Change-Id: I6c3809e0b9468dfe38465c55759c2572c21485da
Reviewed-on: https://chromium-review.googlesource.com/204896
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 5bd564f..e7f2dc2 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -636,7 +636,7 @@
return gl::error(GL_INVALID_OPERATION);
}
- if (buffer->mapped())
+ if (buffer->isMapped())
{
return gl::error(GL_INVALID_OPERATION);
}
@@ -647,7 +647,7 @@
return gl::error(GL_OUT_OF_MEMORY);
}
- if (size + offset > buffer->size())
+ if (size + offset > buffer->getSize())
{
return gl::error(GL_INVALID_VALUE);
}
@@ -2419,22 +2419,22 @@
switch (pname)
{
case GL_BUFFER_USAGE:
- *params = static_cast<GLint>(buffer->usage());
+ *params = static_cast<GLint>(buffer->getUsage());
break;
case GL_BUFFER_SIZE:
- *params = gl::clampCast<GLint>(buffer->size());
+ *params = gl::clampCast<GLint>(buffer->getSize());
break;
case GL_BUFFER_ACCESS_FLAGS:
- *params = buffer->accessFlags();
+ *params = buffer->getAccessFlags();
break;
case GL_BUFFER_MAPPED:
- *params = static_cast<GLint>(buffer->mapped());
+ *params = static_cast<GLint>(buffer->isMapped());
break;
case GL_BUFFER_MAP_OFFSET:
- *params = gl::clampCast<GLint>(buffer->mapOffset());
+ *params = gl::clampCast<GLint>(buffer->getMapOffset());
break;
case GL_BUFFER_MAP_LENGTH:
- *params = gl::clampCast<GLint>(buffer->mapLength());
+ *params = gl::clampCast<GLint>(buffer->getMapLength());
break;
default: UNREACHABLE(); break;
}
@@ -8077,14 +8077,14 @@
return gl::error(GL_INVALID_OPERATION);
}
- if (readBuffer->mapped() || writeBuffer->mapped())
+ if (readBuffer->isMapped() || writeBuffer->isMapped())
{
return gl::error(GL_INVALID_OPERATION);
}
if (readOffset < 0 || writeOffset < 0 || size < 0 ||
- static_cast<unsigned int>(readOffset + size) > readBuffer->size() ||
- static_cast<unsigned int>(writeOffset + size) > writeBuffer->size())
+ static_cast<unsigned int>(readOffset + size) > readBuffer->getSize() ||
+ static_cast<unsigned int>(writeOffset + size) > writeBuffer->getSize())
{
return gl::error(GL_INVALID_VALUE);
}
@@ -8869,22 +8869,22 @@
switch (pname)
{
case GL_BUFFER_USAGE:
- *params = static_cast<GLint64>(buffer->usage());
+ *params = static_cast<GLint64>(buffer->getUsage());
break;
case GL_BUFFER_SIZE:
- *params = buffer->size();
+ *params = buffer->getSize();
break;
case GL_BUFFER_ACCESS_FLAGS:
- *params = static_cast<GLint64>(buffer->accessFlags());
+ *params = static_cast<GLint64>(buffer->getAccessFlags());
break;
case GL_BUFFER_MAPPED:
- *params = static_cast<GLint64>(buffer->mapped());
+ *params = static_cast<GLint64>(buffer->isMapped());
break;
case GL_BUFFER_MAP_OFFSET:
- *params = buffer->mapOffset();
+ *params = buffer->getMapOffset();
break;
case GL_BUFFER_MAP_LENGTH:
- *params = buffer->mapLength();
+ *params = buffer->getMapLength();
break;
default: UNREACHABLE(); break;
}
@@ -9892,12 +9892,12 @@
gl::Buffer *buffer = context->getTargetBuffer(target);
- if (!buffer || !buffer->mapped())
+ if (!buffer || !buffer->isMapped())
{
*params = NULL;
}
- *params = buffer->mapPointer();
+ *params = buffer->getMapPointer();
}
}
catch (...)
@@ -9933,12 +9933,12 @@
return gl::error(GL_INVALID_ENUM, reinterpret_cast<GLvoid*>(NULL));
}
- if (buffer->mapped())
+ if (buffer->isMapped())
{
return gl::error(GL_INVALID_OPERATION, reinterpret_cast<GLvoid*>(NULL));
}
- return buffer->mapRange(0, buffer->size(), GL_MAP_WRITE_BIT);
+ return buffer->mapRange(0, buffer->getSize(), GL_MAP_WRITE_BIT);
}
}
catch (...)
@@ -9966,7 +9966,7 @@
gl::Buffer *buffer = context->getTargetBuffer(target);
- if (buffer == NULL || !buffer->mapped())
+ if (buffer == NULL || !buffer->isMapped())
{
return gl::error(GL_INVALID_OPERATION, GL_FALSE);
}
@@ -10019,7 +10019,7 @@
size_t lengthSize = static_cast<size_t>(length);
if (!rx::IsUnsignedAdditionSafe(offsetSize, lengthSize) ||
- offsetSize + lengthSize > static_cast<size_t>(buffer->size()))
+ offsetSize + lengthSize > static_cast<size_t>(buffer->getSize()))
{
return gl::error(GL_INVALID_VALUE, reinterpret_cast<GLvoid*>(NULL));
}
@@ -10037,7 +10037,7 @@
return gl::error(GL_INVALID_VALUE, reinterpret_cast<GLvoid*>(NULL));
}
- if (length == 0 || buffer->mapped())
+ if (length == 0 || buffer->isMapped())
{
return gl::error(GL_INVALID_OPERATION, reinterpret_cast<GLvoid*>(NULL));
}
@@ -10100,7 +10100,7 @@
return gl::error(GL_INVALID_OPERATION);
}
- if (!buffer->mapped() || (buffer->accessFlags() & GL_MAP_FLUSH_EXPLICIT_BIT) == 0)
+ if (!buffer->isMapped() || (buffer->getAccessFlags() & GL_MAP_FLUSH_EXPLICIT_BIT) == 0)
{
return gl::error(GL_INVALID_OPERATION);
}
@@ -10110,7 +10110,7 @@
size_t lengthSize = static_cast<size_t>(length);
if (!rx::IsUnsignedAdditionSafe(offsetSize, lengthSize) ||
- offsetSize + lengthSize > static_cast<size_t>(buffer->mapLength()))
+ offsetSize + lengthSize > static_cast<size_t>(buffer->getMapLength()))
{
return gl::error(GL_INVALID_VALUE);
}