summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-18 15:35:23 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commita466b742415aeefa3e46356c8a0b7547cc52c377 (patch)
tree3607e1eb475fdd2414ab42d43698587e80dbd6c2 /src
parent6f4741e32ed66a2f0df4a03e9a874f08ab666412 (diff)
mesa: add KHR_no_error support to glVertexBindingDivisor()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml2
-rw-r--r--src/mesa/main/varray.c9
-rw-r--r--src/mesa/main/varray.h3
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
index d1f8db90a11..9dc57f4612b 100644
--- a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
@@ -41,7 +41,7 @@
<param name="bindingindex" type="GLuint"/>
</function>
- <function name="VertexBindingDivisor" es2="3.1">
+ <function name="VertexBindingDivisor" es2="3.1" no_error="true">
<param name="attribindex" type="GLuint"/>
<param name="divisor" type="GLuint"/>
</function>
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index c67396d7e79..9cc995ea55b 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -2712,6 +2712,15 @@ vertex_array_binding_divisor(struct gl_context *ctx,
void GLAPIENTRY
+_mesa_VertexBindingDivisor_no_error(GLuint bindingIndex, GLuint divisor)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ vertex_binding_divisor(ctx, ctx->Array.VAO,
+ VERT_ATTRIB_GENERIC(bindingIndex), divisor);
+}
+
+
+void GLAPIENTRY
_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index ca49042653c..4db9eee0e50 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -452,6 +452,9 @@ extern void GLAPIENTRY
_mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex,
GLuint bindingIndex);
+void GLAPIENTRY
+_mesa_VertexBindingDivisor_no_error(GLuint bindingIndex, GLuint divisor);
+
extern void GLAPIENTRY
_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor);