glBufferSubData fix
According to the OpenGL ES 3.0 spec
(section 2.9.2 Creating Buffer Object Data Stores)
"If data is NULL, then the contents of the buffer
object’s data store are undefined."
So the function should behave the same way, perform
the same checks, but simply skip the copy.
Change-Id: If49e37a8e836618389e105b5377ff183ac3e3107
Reviewed-on: https://swiftshader-review.googlesource.com/3601
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/Buffer.cpp b/src/OpenGL/libGLESv2/Buffer.cpp
index 0c164fa..c8513cb 100644
--- a/src/OpenGL/libGLESv2/Buffer.cpp
+++ b/src/OpenGL/libGLESv2/Buffer.cpp
@@ -72,7 +72,7 @@
void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset)
{
- if(mContents)
+ if(mContents && data)
{
char *buffer = (char*)mContents->lock(sw::PUBLIC);
memcpy(buffer + offset, data, size);
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 786d52d..d89fd79 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -814,11 +814,6 @@
return error(GL_INVALID_VALUE);
}
- if(data == NULL)
- {
- return;
- }
-
es2::Context *context = es2::getContext();
if(context)
