diff options
| author | Timothy Arceri <[email protected]> | 2017-06-28 13:57:10 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-06-29 08:54:11 +1000 |
| commit | d731b189335545abeb71b1cfc8b0562370d68d87 (patch) | |
| tree | 63be940f73973b4275b01cc7537c29347f10b421 | |
| parent | 8e77fceedbd2b030906bacc7c524a77997ae11a1 (diff) | |
mesa: add KHR_no_error support for glEnableVertexA*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 | 18 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 7 |
4 files changed, 27 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 d848f78d62d..00f3db6a7d5 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -589,7 +589,7 @@ <param name="index" type="GLuint" /> </function> - <function name="EnableVertexArrayAttrib"> + <function name="EnableVertexArrayAttrib" 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 b49ea916432..c685580314b 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -5346,7 +5346,7 @@ <glx handcode="true"/> </function> - <function name="EnableVertexAttribArray" es2="2.0"> + <function name="EnableVertexAttribArray" 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 74d96b3212f..b193544d1a1 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1100,6 +1100,15 @@ _mesa_EnableVertexAttribArray(GLuint index) void GLAPIENTRY +_mesa_EnableVertexAttribArray_no_error(GLuint index) +{ + GET_CURRENT_CONTEXT(ctx); + _mesa_enable_vertex_array_attrib(ctx, ctx->Array.VAO, + VERT_ATTRIB_GENERIC(index)); +} + + +void GLAPIENTRY _mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index) { GET_CURRENT_CONTEXT(ctx); @@ -1120,6 +1129,15 @@ _mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index) } +void GLAPIENTRY +_mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj); + _mesa_enable_vertex_array_attrib(ctx, vao, VERT_ATTRIB_GENERIC(index)); +} + + static void disable_vertex_array_attrib(struct gl_context *ctx, struct gl_vertex_array_object *vao, diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 1dbdbdb5059..be8abf96aeb 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -223,10 +223,17 @@ _mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type, extern void GLAPIENTRY _mesa_EnableVertexAttribArray(GLuint index); +extern void GLAPIENTRY +_mesa_EnableVertexAttribArray_no_error(GLuint index); + extern void GLAPIENTRY _mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index); +extern void GLAPIENTRY +_mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index); + + extern void GLAPIENTRY _mesa_DisableVertexAttribArray(GLuint index); |