mesa: add KHR_no_error support to glDeleteSamplers()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml
index 41fb1c0cca1315f681a94d646d93b81fa30a54f0..e10984b3f7623ea053d857f644a402bc7ea27ed6 100644 (file)
--- 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 4cb4914731b261a19d0c0d3f6fe134e836c88290..2ecb01777b3454fdfd23f741f08a83af82f1cba8 100644 (file)
--- 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 76c2c124242aecebd476ce374f61ce2a65a80bb9..2a28757b9b22ca88a58e997045cfc984c3e7571b 100644 (file)
--- 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);