summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-06-28 13:32:35 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-06-29 08:54:10 +1000
commit774580c8b9ae6a2def64f63163c71179fd55a624 (patch)
tree40c184bee31862c50b99451dbc8d51de7bb05be1
parent9853ca6037b92d176ea35dc0d213b66c25392dc0 (diff)
mesa: add KHR_no_error support for glPixelStore*()
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-rw-r--r--src/mapi/glapi/gen/gl_API.xml4
-rw-r--r--src/mesa/main/pixelstore.c13
-rw-r--r--src/mesa/main/pixelstore.h8
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 );