diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-31 12:39:44 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-07 11:03:45 +0200 |
| commit | 5da83140dfdb1c6109f061ec28ba5f0e705dd09e (patch) | |
| tree | 4d39aee92682a4d479d282b0f8b802dc62428654 | |
| parent | a11c7e3fb51ff185675220083d4d33c7ee6a58c5 (diff) | |
mesa: add KHR_no_error support for glVertexArrayVertexBuffers()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 15 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 6 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index f13a1444a95..cb24d7981cb 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -607,7 +607,7 @@ <param name="stride" type="GLsizei" /> </function> - <function name="VertexArrayVertexBuffers"> + <function name="VertexArrayVertexBuffers" no_error="true"> <param name="vaobj" type="GLuint" /> <param name="first" type="GLuint" /> <param name="count" type="GLsizei" /> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index c2c771c173c..0cc8b56c641 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2273,6 +2273,21 @@ _mesa_BindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, void GLAPIENTRY +_mesa_VertexArrayVertexBuffers_no_error(GLuint vaobj, GLuint first, + GLsizei count, const GLuint *buffers, + const GLintptr *offsets, + const GLsizei *strides) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj); + vertex_array_vertex_buffers(ctx, vao, first, count, + buffers, offsets, strides, true, + "glVertexArrayVertexBuffers"); +} + + +void GLAPIENTRY _mesa_VertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides) diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 24e37a9bf7e..90ca8483cab 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -379,6 +379,12 @@ extern void GLAPIENTRY _mesa_BindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides); +void GLAPIENTRY +_mesa_VertexArrayVertexBuffers_no_error(GLuint vaobj, GLuint first, + GLsizei count, const GLuint *buffers, + const GLintptr *offsets, + const GLsizei *strides); + extern void GLAPIENTRY _mesa_VertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, |