Module: Mesa Branch: master Commit: 774580c8b9ae6a2def64f63163c71179fd55a624 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=774580c8b9ae6a2def64f63163c71179fd55a624
Author: Timothy Arceri <tarc...@itsqueeze.com> Date: Wed Jun 28 13:32:35 2017 +1000 mesa: add KHR_no_error support for glPixelStore*() Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- src/mapi/glapi/gen/gl_API.xml | 4 ++-- src/mesa/main/pixelstore.c | 13 +++++++++++++ src/mesa/main/pixelstore.h | 8 ++++++++ 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 85083a428d..a63fd3c918 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 38e60723ca..4738f96213 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 68384548a0..d21c6fe27f 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 ); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit