mesa: add KHR_no_error support to glBindTextures()

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 5d78954fad40eb7a349d8c5d3d25420ce34f049b..75266ec615005f9d8245352fdbd8322d04fa8138 100644 (file)
--- a/src/mapi/glapi/gen/ARB_multi_bind.xml
+++ b/src/mapi/glapi/gen/ARB_multi_bind.xml
@@ -23,7 +23,7 @@
         <param name="sizes" type="const GLsizeiptr *"/>
     </function>
 
-    <function name="BindTextures">
+    <function name="BindTextures" no_error="true">
         <param name="first" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="textures" type="const GLuint *"/>

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index aa3e4190f5214b682f2b19e1d241dcb8885713b6..b698569509f72307a4c06da15f63512bd1348127 100644 (file)
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1872,6 +1872,14 @@ bind_textures(struct gl_context *ctx, GLuint first, GLsizei count,
 }
 
 
+void GLAPIENTRY
+_mesa_BindTextures_no_error(GLuint first, GLsizei count, const GLuint *textures)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_textures(ctx, first, count, textures, true);
+}
+
+
 void GLAPIENTRY
 _mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {

diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 4971a2075d80535310018dc7731a1844d6759cce..6443a567051f7e2b13f60ed95231e18c4eb31b69 100644 (file)
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -205,6 +205,10 @@ _mesa_BindTextureUnit_no_error(GLuint unit, GLuint texture);
 extern void GLAPIENTRY
 _mesa_BindTextureUnit(GLuint unit, GLuint texture);
 
+void GLAPIENTRY
+_mesa_BindTextures_no_error(GLuint first, GLsizei count,
+                            const GLuint *textures);
+
 extern void GLAPIENTRY
 _mesa_BindTextures( GLuint first, GLsizei count, const GLuint *textures );