From ef0b0389818f9dd99e55e44e52dc7e4446e37c79 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 18 Jul 2017 20:48:40 +0200
Subject: [PATCH] mesa: add KHR_no_error support to glDeleteSamplers()

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

diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml
index 41fb1c0cca1..e10984b3f76 100644
--- a/src/mapi/glapi/gen/ARB_sampler_objects.xml
+++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -12,7 +12,7 @@
       <param name="samplers" type="GLuint *"/>
     </function>
 
-    <function name="DeleteSamplers" es2="3.0">
+    <function name="DeleteSamplers" es2="3.0" no_error="true">
       <param name="count" type="GLsizei"/>
       <param name="samplers" type="const GLuint *"/>
     </function>
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 4cb4914731b..2ecb01777b3 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -265,6 +265,14 @@ delete_samplers(struct gl_context *ctx, GLsizei count, const GLuint *samplers)
 }
 
 
+void GLAPIENTRY
+_mesa_DeleteSamplers_no_error(GLsizei count, const GLuint *samplers)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   delete_samplers(ctx, count, samplers);
+}
+
+
 void GLAPIENTRY
 _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers)
 {
diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index 76c2c124242..2a28757b9b2 100644
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -106,8 +106,13 @@ _mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers);
 
 void GLAPIENTRY
 _mesa_CreateSamplers(GLsizei count, GLuint *samplers);
+
+void GLAPIENTRY
+_mesa_DeleteSamplers_no_error(GLsizei count, const GLuint *samplers);
+
 void GLAPIENTRY
 _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers);
+
 GLboolean GLAPIENTRY
 _mesa_IsSampler(GLuint sampler);
 
-- 
2.30.2