summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-07-18 18:18:59 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-07-31 13:53:39 +0200
commitc566ba29b6c456f4b19da704113ad70504879e3f (patch)
tree6f80238541140b30244df52a25be83121d9d7a67
parentef22651d7e5303edf5f2ee98a35187b48203a9e0 (diff)
mesa: add KHR_no_error to glDeleteVertexArrays()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
-rw-r--r--src/mapi/glapi/gen/ARB_vertex_array_object.xml2
-rw-r--r--src/mesa/main/arrayobj.c8
-rw-r--r--src/mesa/main/arrayobj.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mapi/glapi/gen/ARB_vertex_array_object.xml
index c703477576..befa4c91c6 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 2c95b001a2..29dd93b1c7 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -500,6 +500,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)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 5d7fb0a087..691475fb2f 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