diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 18:11:26 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 4b0a33d233469fd646852b7d783d5170113dd629 (patch) | |
| tree | 305256352e7fc2de737b7374f859203b891892fc | |
| parent | 81fa33171d041491fd262238ce299404ab4fac25 (diff) | |
mesa: add KHR_no_error to glBindVertexArray()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_vertex_array_object.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/arrayobj.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/arrayobj.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 57eaa1d3ffb..c703477576f 100644 --- a/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -10,7 +10,7 @@ <enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/> - <function name="BindVertexArray" es2="3.0" + <function name="BindVertexArray" es2="3.0" no_error="true" marshal_fail="_mesa_glthread_is_compat_bind_vertex_array(ctx)"> <param name="array" type="GLuint"/> </function> diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index fcc7990ef0d..77c0206ecfd 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -445,6 +445,14 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, bool no_error) void GLAPIENTRY +_mesa_BindVertexArray_no_error(GLuint id) +{ + GET_CURRENT_CONTEXT(ctx); + bind_vertex_array(ctx, id, true); +} + + +void GLAPIENTRY _mesa_BindVertexArray(GLuint id) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 69ffc9250d9..5d7fb0a087c 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -94,6 +94,9 @@ _mesa_all_buffers_are_unmapped(const struct gl_vertex_array_object *vao); */ +void GLAPIENTRY +_mesa_BindVertexArray_no_error(GLuint id); + void GLAPIENTRY _mesa_BindVertexArray( GLuint id ); void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids); |