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

main: Improve errors and style in BufferSubData. 

- More explicit error reporting.
- Removed legacy style.

Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
This commit is contained in:
Laura Ekstrand 2015-02-11 11:06:42 -08:00
parent 566ccdf11b
commit 9cb732b8e9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,13 +272,17 @@ buffer_object_subdata_range_good(struct gl_context *ctx,
if (mappedRange) {
if (bufferobj_range_mapped(bufObj, offset, size)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(range is mapped without persistent bit)",
caller);
return false;
}
}
else {
if (_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(buffer is mapped without persistent bit)",
caller);
return false;
}
}
@ -1642,7 +1646,7 @@ _mesa_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
bufObj->Written = GL_TRUE;
assert(ctx->Driver.BufferSubData);
ctx->Driver.BufferSubData( ctx, offset, size, data, bufObj );
ctx->Driver.BufferSubData(ctx, offset, size, data, bufObj);
}
void GLAPIENTRY

4
src/mesa/main/bufferobj.h
View File

@ -190,8 +190,8 @@ _mesa_NamedBufferData(GLuint buffer, GLsizeiptr size,
const GLvoid *data, GLenum usage);
void GLAPIENTRY
_mesa_BufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, const GLvoid * data);
_mesa_BufferSubData(GLenum target, GLintptr offset,
GLsizeiptr size, const GLvoid *data);
void GLAPIENTRY
_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,