summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mapi/glapi/gen/ARB_multi_bind.xml2
-rw-r--r--src/mesa/main/texobj.c8
-rw-r--r--src/mesa/main/texobj.h4
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_multi_bind.xml b/src/mapi/glapi/gen/ARB_multi_bind.xml
index 5d78954fad4..75266ec6150 100644
--- 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 aa3e4190f52..b698569509f 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1873,6 +1873,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)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 4971a2075d8..6443a567051 100644
--- 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 );