diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 415ed6a98bb..ba71d36451e 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1961,7 +1961,7 @@
         <glx rop="78"/>
     </function>
 
-    <function name="CullFace" es1="1.0" es2="2.0">
+    <function name="CullFace" es1="1.0" es2="2.0" no_error="true">
         <param name="mode" type="GLenum"/>
         <glx rop="79"/>
     </function>
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 13dca6d39cf..49a60e8e533 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -65,6 +65,14 @@ cull_face(struct gl_context *ctx, GLenum mode)
 }
 
 
+void GLAPIENTRY
+_mesa_CullFace_no_error(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   cull_face(ctx, mode);
+}
+
+
 void GLAPIENTRY
 _mesa_CullFace(GLenum mode)
 {
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index ceca848d6d4..78c7f711642 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -39,6 +39,9 @@ struct gl_context;
 extern void GLAPIENTRY
 _mesa_GetnPolygonStippleARB( GLsizei bufSize, GLubyte *dest );
 
+void GLAPIENTRY
+_mesa_CullFace_no_error(GLenum mode);
+
 extern void GLAPIENTRY
 _mesa_CullFace(GLenum mode);