mesa: add KHR_no_error support to glBindSampler()

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 9fe6c41c8558a20fcf3ba4893ad79f711f1935f4..41fb1c0cca1315f681a94d646d93b81fa30a54f0 100644 (file)
--- a/src/mapi/glapi/gen/ARB_sampler_objects.xml
+++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -22,7 +22,7 @@
       <return type="GLboolean"/>
     </function>
 
-    <function name="BindSampler" es2="3.0">
+    <function name="BindSampler" es2="3.0" no_error="true">
       <param name="unit" type="GLuint"/>
       <param name="sampler" type="GLuint"/>
     </function>

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 260cff6450aba7ff62e428e50d80745dceccb0dc..59ec813013e1258f492adf50374a9244163ab169 100644 (file)
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -318,6 +318,13 @@ bind_sampler(struct gl_context *ctx, GLuint unit, GLuint sampler, bool no_error)
    _mesa_bind_sampler(ctx, unit, sampObj);
 }
 
+void GLAPIENTRY
+_mesa_BindSampler_no_error(GLuint unit, GLuint sampler)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_sampler(ctx, unit, sampler, true);
+}
+
 void GLAPIENTRY
 _mesa_BindSampler(GLuint unit, GLuint sampler)
 {

diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index eb20df1040d621614a0e45c67dce3172babe2cb2..76c2c124242aecebd476ce374f61ce2a65a80bb9 100644 (file)
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -110,6 +110,10 @@ void GLAPIENTRY
 _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers);
 GLboolean GLAPIENTRY
 _mesa_IsSampler(GLuint sampler);
+
+void GLAPIENTRY
+_mesa_BindSampler_no_error(GLuint unit, GLuint sampler);
+
 void GLAPIENTRY
 _mesa_BindSampler(GLuint unit, GLuint sampler);