diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-06-26 15:50:48 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-06-28 10:25:13 +0200 |
| commit | 89bc3ed7a3c78d7cacb6ea486b708a3a3374fcd8 (patch) | |
| tree | d8cb35a5ee4860cec9634369a70569d709581144 | |
| parent | 401fa6913283abd313b40fecc47995f6d986f5ad (diff) | |
mesa: add KHR_no_error support for glVertex*AttribBinding()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 23 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 7 |
4 files changed, 32 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 bd94e8e42c5..6226aa0b9d2 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -641,7 +641,7 @@ <param name="relativeoffset" type="GLuint" /> </function> - <function name="VertexArrayAttribBinding"> + <function name="VertexArrayAttribBinding" no_error="true"> <param name="vaobj" type="GLuint" /> <param name="attribindex" type="GLuint" /> <param name="bindingindex" type="GLuint" /> diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml index 101c23c53b5..d1f8db90a11 100644 --- a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml +++ b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml @@ -36,7 +36,7 @@ <param name="relativeoffset" type="GLuint"/> </function> - <function name="VertexAttribBinding" es2="3.1"> + <function name="VertexAttribBinding" es2="3.1" no_error="true"> <param name="attribindex" type="GLuint"/> <param name="bindingindex" type="GLuint"/> </function> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index a02dbb2fda8..74d96b3212f 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2576,6 +2576,16 @@ vertex_array_attrib_binding(struct gl_context *ctx, void GLAPIENTRY +_mesa_VertexAttribBinding_no_error(GLuint attribIndex, GLuint bindingIndex) +{ + GET_CURRENT_CONTEXT(ctx); + vertex_attrib_binding(ctx, ctx->Array.VAO, + VERT_ATTRIB_GENERIC(attribIndex), + VERT_ATTRIB_GENERIC(bindingIndex)); +} + + +void GLAPIENTRY _mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex) { GET_CURRENT_CONTEXT(ctx); @@ -2599,6 +2609,19 @@ _mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex) void GLAPIENTRY +_mesa_VertexArrayAttribBinding_no_error(GLuint vaobj, GLuint attribIndex, + GLuint bindingIndex) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj); + vertex_attrib_binding(ctx, vao, + VERT_ATTRIB_GENERIC(attribIndex), + VERT_ATTRIB_GENERIC(bindingIndex)); +} + + +void GLAPIENTRY _mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex, GLuint bindingIndex) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 8525fcc181e..1dbdbdb5059 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -425,9 +425,16 @@ _mesa_VertexArrayAttribLFormat(GLuint vaobj, GLuint attribIndex, GLint size, GLenum type, GLuint relativeOffset); +void GLAPIENTRY +_mesa_VertexAttribBinding_no_error(GLuint attribIndex, GLuint bindingIndex); + extern void GLAPIENTRY _mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex); +void GLAPIENTRY +_mesa_VertexArrayAttribBinding_no_error(GLuint vaobj, GLuint attribIndex, + GLuint bindingIndex); + extern void GLAPIENTRY _mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex, GLuint bindingIndex); |