summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-07-18 15:39:13 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-07-31 13:53:39 +0200
commit0e69fc92e2bc9cf5e9083378ba536fc87de88221 (patch)
tree9a4aba8a2b3b2ddad8f302e1f6f3db81209bb8cb
parenta466b742415aeefa3e46356c8a0b7547cc52c377 (diff)
mesa: add KHR_no_error support to glVertexArrayBindingDivisor()
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.xml2
-rw-r--r--src/mesa/main/varray.c11
-rw-r--r--src/mesa/main/varray.h4
3 files changed, 16 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 8e91d80141..4439c5bcbe 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -647,7 +647,7 @@
<param name="bindingindex" type="GLuint" />
</function>
- <function name="VertexArrayBindingDivisor">
+ <function name="VertexArrayBindingDivisor" no_error="true">
<param name="vaobj" type="GLuint" />
<param name="bindingindex" type="GLuint" />
<param name="divisor" type="GLuint" />
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 9cc995ea55..db9261f105 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -2744,6 +2744,17 @@ _mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor)
void GLAPIENTRY
+_mesa_VertexArrayBindingDivisor_no_error(GLuint vaobj, GLuint bindingIndex,
+ GLuint divisor)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj);
+ vertex_binding_divisor(ctx, vao, VERT_ATTRIB_GENERIC(bindingIndex), divisor);
+}
+
+
+void GLAPIENTRY
_mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
GLuint divisor)
{
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 4db9eee0e5..182fb544f6 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -458,6 +458,10 @@ _mesa_VertexBindingDivisor_no_error(GLuint bindingIndex, GLuint divisor);
extern void GLAPIENTRY
_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor);
+void GLAPIENTRY
+_mesa_VertexArrayBindingDivisor_no_error(GLuint vaobj, GLuint bindingIndex,
+ GLuint divisor);
+
extern void GLAPIENTRY
_mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint divisor);