From 9d331739ae72c5678701c8b1b5d0f460c6e2c857 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 22 May 2017 15:46:54 +1000
Subject: [PATCH] mesa: add KHR_no_error support for glBindVertexBuffer()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---
 .../glapi/gen/ARB_vertex_attrib_binding.xml     |  2 +-
 src/mesa/main/varray.c                          | 17 ++++++++++++++---
 src/mesa/main/varray.h                          |  3 +++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
index ba9ca57bb54..101c23c53b5 100644
--- a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
@@ -7,7 +7,7 @@
 
 <category name="GL_ARB_vertex_attrib_binding" number="125">
 
-    <function name="BindVertexBuffer" es2="3.1">
+    <function name="BindVertexBuffer" es2="3.1" no_error="true">
         <param name="bindingindex" type="GLuint"/>
         <param name="buffer" type="GLuint"/>
         <param name="offset" type="GLintptr"/>
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index f33f3022061..df14a8b765c 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1953,7 +1953,7 @@ static ALWAYS_INLINE void
 vertex_array_vertex_buffer(struct gl_context *ctx,
                            struct gl_vertex_array_object *vao,
                            GLuint bindingIndex, GLuint buffer, GLintptr offset,
-                           GLsizei stride, const char *func)
+                           GLsizei stride, bool no_error, const char *func)
 {
    struct gl_buffer_object *vbo;
    if (buffer ==
@@ -1962,7 +1962,7 @@ vertex_array_vertex_buffer(struct gl_context *ctx,
    } else if (buffer != 0) {
       vbo = _mesa_lookup_bufferobj(ctx, buffer);
 
-      if (!vbo && _mesa_is_gles31(ctx)) {
+      if (!no_error && !vbo && _mesa_is_gles31(ctx)) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", func);
          return;
       }
@@ -2043,7 +2043,18 @@ vertex_array_vertex_buffer_err(struct gl_context *ctx,
    }
 
    vertex_array_vertex_buffer(ctx, vao, bindingIndex, buffer, offset,
-                              stride, func);
+                              stride, false, func);
+}
+
+
+void GLAPIENTRY
+_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
+                                GLintptr offset, GLsizei stride)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   vertex_array_vertex_buffer(ctx, ctx->Array.VAO, bindingIndex,
+                              buffer, offset, stride, true,
+                              "glBindVertexBuffer");
 }
 
 
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 2d184adf8bc..c3cd5d207c4 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -360,6 +360,9 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
    return ctx->Array.RestartIndex;
 }
 
+extern void GLAPIENTRY
+_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
+                                GLintptr offset, GLsizei stride);
 extern void GLAPIENTRY
 _mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
                        GLsizei stride);
-- 
2.30.2