3 files changed, 23 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 85083a428da..a63fd3c918f 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2593,13 +2593,13 @@
         <glx rop="167"/>
     </function>
 
-    <function name="PixelStoref">
+    <function name="PixelStoref" no_error="true">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx sop="109" handcode="client"/>
     </function>
 
-    <function name="PixelStorei" es1="1.0" es2="2.0">
+    <function name="PixelStorei" es1="1.0" es2="2.0" no_error="true">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx sop="110" handcode="client"/>
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index 38e60723ca4..4738f962135 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -238,6 +238,19 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
 }
 
 
+void GLAPIENTRY
+_mesa_PixelStorei_no_error(GLenum pname, GLint param)
+{
+   pixel_storei(pname, param, true);
+}
+
+
+void GLAPIENTRY
+_mesa_PixelStoref_no_error(GLenum pname, GLfloat param)
+{
+   _mesa_PixelStorei_no_error(pname, IROUND(param));
+}
+
 
 /**
  * Initialize the context's pixel store state.
diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h
index 68384548a0f..d21c6fe27f4 100644
--- a/src/mesa/main/pixelstore.h
+++ b/src/mesa/main/pixelstore.h
@@ -45,6 +45,14 @@ extern void GLAPIENTRY
 _mesa_PixelStoref( GLenum pname, GLfloat param );
 
 
+extern void GLAPIENTRY
+_mesa_PixelStorei_no_error(GLenum pname, GLint param);
+
+
+extern void GLAPIENTRY
+_mesa_PixelStoref_no_error(GLenum pname, GLfloat param);
+
+
 extern void
 _mesa_init_pixelstore( struct gl_context *ctx );