diff options
| author | Timothy Arceri <[email protected]> | 2017-06-28 14:09:22 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-06-29 08:54:11 +1000 |
| commit | d8143a4bde01dcbef7d5099fcdde6a810ca2d99a (patch) | |
| tree | 5df0bbfc81e96c6084fcb40bca1c8cdb936be011 | |
| parent | 73e0140acc118e0a53ac601adba9fe85833ff32c (diff) | |
mesa: add KHR_no_error support for glDisableVertexA*A*()
Reviewed-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 17 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 6 |
4 files changed, 25 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index 00f3db6a7d5..cf33ee38732 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -584,7 +584,7 @@ <param name="arrays" type="GLuint *" /> </function> - <function name="DisableVertexArrayAttrib"> + <function name="DisableVertexArrayAttrib" no_error="true"> <param name="vaobj" type="GLuint" /> <param name="index" type="GLuint" /> </function> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index c685580314b..8a8f15b9dd4 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -5340,7 +5340,7 @@ <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" es2="2.0"> + <function name="DisableVertexAttribArray" es2="2.0" no_error="true"> <param name="index" type="GLuint"/> <glx ignore="true"/> <glx handcode="true"/> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index fcc9a31c896..c67396d7e79 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1170,6 +1170,14 @@ _mesa_DisableVertexAttribArray(GLuint index) void GLAPIENTRY +_mesa_DisableVertexAttribArray_no_error(GLuint index) +{ + GET_CURRENT_CONTEXT(ctx); + disable_vertex_array_attrib(ctx, ctx->Array.VAO, index); +} + + +void GLAPIENTRY _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index) { GET_CURRENT_CONTEXT(ctx); @@ -1195,6 +1203,15 @@ _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index) } +void GLAPIENTRY +_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj); + disable_vertex_array_attrib(ctx, vao, index); +} + + /** * Return info for a vertex attribute array (no alias with legacy * vertex attributes (pos, normal, color, etc)). This function does diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index be8abf96aeb..ca49042653c 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -238,10 +238,16 @@ _mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index); extern void GLAPIENTRY _mesa_DisableVertexAttribArray(GLuint index); +extern void GLAPIENTRY +_mesa_DisableVertexAttribArray_no_error(GLuint index); + extern void GLAPIENTRY _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index); +extern void GLAPIENTRY +_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index); + extern void GLAPIENTRY _mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params); |