From c566ba29b6c456f4b19da704113ad70504879e3f Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 18 Jul 2017 18:18:59 +0200
Subject: [PATCH] mesa: add KHR_no_error to glDeleteVertexArrays()

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

diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mapi/glapi/gen/ARB_vertex_array_object.xml
index c703477576f..befa4c91c63 100644
--- a/src/mapi/glapi/gen/ARB_vertex_array_object.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_array_object.xml
@@ -15,7 +15,7 @@
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArrays" es2="3.0">
+    <function name="DeleteVertexArrays" es2="3.0" no_error="true">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="const GLuint *" count="n"/>
     </function>
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 2c95b001a25..29dd93b1c7c 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -499,6 +499,14 @@ delete_vertex_arrays(struct gl_context *ctx, GLsizei n, const GLuint *ids)
 }
 
 
+void GLAPIENTRY
+_mesa_DeleteVertexArrays_no_error(GLsizei n, const GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   delete_vertex_arrays(ctx, n, ids);
+}
+
+
 void GLAPIENTRY
 _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
 {
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 5d7fb0a087c..691475fb2fd 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -99,6 +99,9 @@ _mesa_BindVertexArray_no_error(GLuint id);
 
 void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
 
+void GLAPIENTRY
+_mesa_DeleteVertexArrays_no_error(GLsizei n, const GLuint *ids);
+
 void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
 
 void GLAPIENTRY
-- 
2.30.2