diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 513b57aab3d..dd64fe27b6a 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2556,7 +2556,7 @@
         <glx rop="161"/>
     </function>
 
-    <function name="StencilFunc" es1="1.0" es2="2.0">
+    <function name="StencilFunc" es1="1.0" es2="2.0" no_error="true">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLint"/>
         <param name="mask" type="GLuint"/>
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 4c35b2d20d7..82dd7870675 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -229,6 +229,14 @@ stencil_func(struct gl_context *ctx, GLenum func, GLint ref, GLuint mask)
 }
 
 
+void GLAPIENTRY
+_mesa_StencilFunc_no_error(GLenum func, GLint ref, GLuint mask)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   stencil_func(ctx, func, ref, mask);
+}
+
+
 void GLAPIENTRY
 _mesa_StencilFunc(GLenum func, GLint ref, GLuint mask)
 {
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index a7a2210ac9b..71844712a28 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -41,6 +41,9 @@ extern void GLAPIENTRY
 _mesa_ClearStencil( GLint s );
 
 
+void GLAPIENTRY
+_mesa_StencilFunc_no_error(GLenum func, GLint ref, GLuint mask);
+
 extern void GLAPIENTRY
 _mesa_StencilFunc(GLenum func, GLint ref, GLuint mask);