From 2933ed56cef8804be4179d68704614735b92fee4 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 31 May 2017 12:42:39 +0200
Subject: [PATCH] mesa: add KHR_no_error support for glBindVertexBuffers()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/ARB_multi_bind.xml |  2 +-
 src/mesa/main/varray.c                | 13 +++++++++++++
 src/mesa/main/varray.h                |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/ARB_multi_bind.xml b/src/mapi/glapi/gen/ARB_multi_bind.xml
index d58c2708cb2..601680f30bd 100644
--- a/src/mapi/glapi/gen/ARB_multi_bind.xml
+++ b/src/mapi/glapi/gen/ARB_multi_bind.xml
@@ -41,7 +41,7 @@
         <param name="textures" type="const GLuint *"/>
     </function>
 
-    <function name="BindVertexBuffers">
+    <function name="BindVertexBuffers" no_error="true">
         <param name="first" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="buffers" type="const GLuint *"/>
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 0cc8b56c641..a08b11fcf8d 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -2248,6 +2248,19 @@ vertex_array_vertex_buffers_err(struct gl_context *ctx,
 }
 
 
+void GLAPIENTRY
+_mesa_BindVertexBuffers_no_error(GLuint first, GLsizei count,
+                                 const GLuint *buffers, const GLintptr *offsets,
+                                 const GLsizei *strides)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   vertex_array_vertex_buffers(ctx, ctx->Array.VAO, first, count,
+                               buffers, offsets, strides, true,
+                               "glBindVertexBuffers");
+}
+
+
 void GLAPIENTRY
 _mesa_BindVertexBuffers(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 90ca8483cab..43b9fe905ef 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -375,6 +375,11 @@ extern void GLAPIENTRY
 _mesa_VertexArrayVertexBuffer(GLuint vaobj, GLuint bindingIndex, GLuint buffer,
                               GLintptr offset, GLsizei stride);
 
+void GLAPIENTRY
+_mesa_BindVertexBuffers_no_error(GLuint first, GLsizei count,
+                                 const GLuint *buffers, const GLintptr *offsets,
+                                 const GLsizei *strides);
+
 extern void GLAPIENTRY
 _mesa_BindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers,
                         const GLintptr *offsets, const GLsizei *strides);
-- 
2.30.2