diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index bbb44866f91..2f893960c56 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -82,7 +82,7 @@
   <enum name="TRANSFORM_FEEDBACK_BUFFER_ACTIVE"    value="0x8E24"/>
   <enum name="TRANSFORM_FEEDBACK_BINDING"          value="0x8E25"/>
 
-  <function name="BindTransformFeedback" es2="3.0">
+  <function name="BindTransformFeedback" es2="3.0" no_error="true">
     <param name="target" type="GLenum"/>
     <param name="id" type="GLuint"/>
   </function>
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index d61db4eb628..307728c3995 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -1079,6 +1079,14 @@ bind_transform_feedback(struct gl_context *ctx, GLuint name, bool no_error)
 }
 
 
+void GLAPIENTRY
+_mesa_BindTransformFeedback_no_error(GLenum target, GLuint name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_transform_feedback(ctx, name, true);
+}
+
+
 void GLAPIENTRY
 _mesa_BindTransformFeedback(GLenum target, GLuint name)
 {
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index c59ade7f0a8..47639bb56fd 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -105,6 +105,9 @@ _mesa_CreateTransformFeedbacks(GLsizei n, GLuint *names);
 extern GLboolean GLAPIENTRY
 _mesa_IsTransformFeedback(GLuint name);
 
+void GLAPIENTRY
+_mesa_BindTransformFeedback_no_error(GLenum target, GLuint name);
+
 extern void GLAPIENTRY
 _mesa_BindTransformFeedback(GLenum target, GLuint name);