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/3601Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

glBufferSubData fix
dafae035 · Alexis Hetu · Alexis Hétu · be381599 · dafae035 · dafae035
Commit dafae035 authored Jun 29, 2015 by Alexis Hetu Committed by Alexis Hétu Jun 30, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

Buffer.cpp src/OpenGL/libGLESv2/Buffer.cpp +1 -1

libGLESv2.cpp src/OpenGL/libGLESv2/libGLESv2.cpp +0 -5

No files found.
--- a/src/OpenGL/libGLESv2/Buffer.cpp
+++ b/src/OpenGL/libGLESv2/Buffer.cpp
@@ -72,7 +72,7 @@ void Buffer::bufferData(const void *data, GLsizeiptr size, GLenum usage)

 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);

--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -814,11 +814,6 @@ void BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid
 		return error(GL_INVALID_VALUE);
 	}

-	if(data == NULL)
-	{
-		return;
-	}
-
 	es2::Context *context = es2::getContext();

 	if(context)