mesa: add KHR_no_error support to glBindSamplers()

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

diff --git a/src/mapi/glapi/gen/ARB_multi_bind.xml b/src/mapi/glapi/gen/ARB_multi_bind.xml
index 601680f30bdf3146afc4881914cbfb40c15e66cf..5d78954fad40eb7a349d8c5d3d25420ce34f049b 100644 (file)
--- a/src/mapi/glapi/gen/ARB_multi_bind.xml
+++ b/src/mapi/glapi/gen/ARB_multi_bind.xml
@@ -29,7 +29,7 @@
         <param name="textures" type="const GLuint *"/>
     </function>
 
-    <function name="BindSamplers">
+    <function name="BindSamplers" no_error="true">
         <param name="first" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="samplers" type="const GLuint *"/>

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 77496ed84996d7a2fed3ac436f702113994d7333..cdfd753a8b971f0d6f4eb2a409257945b5548534 100644 (file)
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -411,6 +411,14 @@ bind_samplers(struct gl_context *ctx, GLuint first, GLsizei count,
 }
 
 
+void GLAPIENTRY
+_mesa_BindSamplers_no_error(GLuint first, GLsizei count, const GLuint *samplers)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_samplers(ctx, first, count, samplers, true);
+}
+
+
 void GLAPIENTRY
 _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {

diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index 26b5dd6b0163066b599860e76f002bbf27b17774..eb20df1040d621614a0e45c67dce3172babe2cb2 100644 (file)
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -112,8 +112,13 @@ GLboolean GLAPIENTRY
 _mesa_IsSampler(GLuint sampler);
 void GLAPIENTRY
 _mesa_BindSampler(GLuint unit, GLuint sampler);
+
+void GLAPIENTRY
+_mesa_BindSamplers_no_error(GLuint first, GLsizei count, const GLuint *samplers);
+
 void GLAPIENTRY
 _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers);
+
 void GLAPIENTRY
 _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param);
 void GLAPIENTRY