diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index ba71d36451e..bcd1205537e 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1990,7 +1990,7 @@
         <glx rop="83"/>
     </function>
 
-    <function name="FrontFace" es1="1.0" es2="2.0">
+    <function name="FrontFace" es1="1.0" es2="2.0" no_error="true">
         <param name="mode" type="GLenum"/>
         <glx rop="84"/>
     </function>
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 7ad536fe5e0..f447993072a 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -121,6 +121,14 @@ front_face(struct gl_context *ctx, GLenum mode, bool no_error)
 }
 
 
+void GLAPIENTRY
+_mesa_FrontFace_no_error(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   front_face(ctx, mode, true);
+}
+
+
 void GLAPIENTRY
 _mesa_FrontFace(GLenum mode)
 {
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index b9570cd1883..39b7a73be20 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -45,6 +45,9 @@ _mesa_CullFace_no_error(GLenum mode);
 extern void GLAPIENTRY
 _mesa_CullFace(GLenum mode);
 
+void GLAPIENTRY
+_mesa_FrontFace_no_error(GLenum mode);
+
 extern void GLAPIENTRY
 _mesa_FrontFace(GLenum mode);