diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 18a78dc315b..8e50a015069 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2097,7 +2097,7 @@
         <glx rop="100"/>
     </function>
 
-    <function name="PolygonMode">
+    <function name="PolygonMode" no_error="true">
         <param name="face" type="GLenum"/>
         <param name="mode" type="GLenum"/>
         <glx rop="101"/>
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 98a9118fd20..44d943e930b 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -220,6 +220,14 @@ polygon_mode(struct gl_context *ctx, GLenum face, GLenum mode, bool no_error)
 }
 
 
+void GLAPIENTRY
+_mesa_PolygonMode_no_error(GLenum face, GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   polygon_mode(ctx, face, mode, true);
+}
+
+
 void GLAPIENTRY
 _mesa_PolygonMode(GLenum face, GLenum mode)
 {
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index 39b7a73be20..1b8186892a3 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -51,6 +51,9 @@ _mesa_FrontFace_no_error(GLenum mode);
 extern void GLAPIENTRY
 _mesa_FrontFace(GLenum mode);
 
+void GLAPIENTRY
+_mesa_PolygonMode_no_error(GLenum face, GLenum mode);
+
 extern void GLAPIENTRY
 _mesa_PolygonMode( GLenum face, GLenum mode );