diff options
| author | Timothy Arceri <[email protected]> | 2017-05-22 15:46:55 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-30 08:03:32 +1000 |
| commit | 85e891283ccbc268d2dae017a9942bb077fc0546 (patch) | |
| tree | 56e34f1bc8e3b759cc6ced853c3a004e5583bc4b | |
| parent | 9d331739ae72c5678701c8b1b5d0f460c6e2c857 (diff) | |
mesa: add KHR_no_error support for glVertexArrayVertexBuffer()
Reviewed-by: Iago Toral Quiroga <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 4 |
3 files changed, 18 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 b8780f75b35..f13a1444a95 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -599,7 +599,7 @@ <param name="buffer" type="GLuint" /> </function> - <function name="VertexArrayVertexBuffer"> + <function name="VertexArrayVertexBuffer" no_error="true"> <param name="vaobj" type="GLuint" /> <param name="bindingindex" type="GLuint" /> <param name="buffer" type="GLuint" /> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index df14a8b765c..47528ba2a79 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2083,6 +2083,19 @@ _mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset, void GLAPIENTRY +_mesa_VertexArrayVertexBuffer_no_error(GLuint vaobj, GLuint bindingIndex, + GLuint buffer, GLintptr offset, + GLsizei stride) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj); + vertex_array_vertex_buffer(ctx, vao, bindingIndex, buffer, offset, + stride, true, "glVertexArrayVertexBuffer"); +} + + +void GLAPIENTRY _mesa_VertexArrayVertexBuffer(GLuint vaobj, GLuint bindingIndex, GLuint buffer, GLintptr offset, GLsizei stride) { diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index c3cd5d207c4..24e37a9bf7e 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -367,6 +367,10 @@ extern void GLAPIENTRY _mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset, GLsizei stride); +void GLAPIENTRY +_mesa_VertexArrayVertexBuffer_no_error(GLuint vaobj, GLuint bindingIndex, + GLuint buffer, GLintptr offset, + GLsizei stride); extern void GLAPIENTRY _mesa_VertexArrayVertexBuffer(GLuint vaobj, GLuint bindingIndex, GLuint buffer, GLintptr offset, GLsizei stride); |