KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: fix the checks in _mesa_InvalidateBuffer(Sub)Data 

Change the check to be in line with what the quoted spec fragment says.

I have sent out a piglit test for this as well.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Nicolai Hähnle 2016-01-09 17:51:39 -05:00
parent cbcdef7b40
commit 53c77494aa
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/bufferobj.c
View File

@ -3898,8 +3898,14 @@ _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset,
struct gl_buffer_object *bufObj;
const GLintptr end = offset + length;
/* Section 6.5 (Invalidating Buffer Data) of the OpenGL 4.5 (Compatibility
* Profile) spec says:
*
* "An INVALID_VALUE error is generated if buffer is zero or is not the
* name of an existing buffer object."
*/
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
if (!bufObj) {
if (!bufObj || bufObj == &DummyBufferObject) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glInvalidateBufferSubData(name = 0x%x) invalid object",
buffer);
@ -3912,7 +3918,7 @@ _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset,
* negative, or if <offset> + <length> is greater than the value of
* BUFFER_SIZE."
*/
if (end < 0 || end > bufObj->Size) {
if (offset < 0 || length < 0 || end > bufObj->Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glInvalidateBufferSubData(invalid offset or length)");
return;
@ -3945,8 +3951,14 @@ _mesa_InvalidateBufferData(GLuint buffer)
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
/* Section 6.5 (Invalidating Buffer Data) of the OpenGL 4.5 (Compatibility
* Profile) spec says:
*
* "An INVALID_VALUE error is generated if buffer is zero or is not the
* name of an existing buffer object."
*/
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
if (!bufObj) {
if (!bufObj || bufObj == &DummyBufferObject) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glInvalidateBufferData(name = 0x%x) invalid object",
buffer);