diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 17:30:54 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | fee507b9092e0998c3f7e710b0d2feb3f191fec3 (patch) | |
| tree | 1c30f84dd371071aa6f8a0583dc88f9fa2a52da6 | |
| parent | 333663f601a7ed83c2cd7b1dc67cfebdb222de0c (diff) | |
mesa: add KHR_no_error support to glRead*Pixels*()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_robustness.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/readpix.c | 16 | ||||
| -rw-r--r-- | src/mesa/main/readpix.h | 9 |
4 files changed, 27 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mapi/glapi/gen/ARB_robustness.xml index 9b2f2f0a74c..1f6ac4696b6 100644 --- a/src/mapi/glapi/gen/ARB_robustness.xml +++ b/src/mapi/glapi/gen/ARB_robustness.xml @@ -82,7 +82,7 @@ <param name="img" type="GLvoid *" output="true"/> </function> - <function name="ReadnPixelsARB"> + <function name="ReadnPixelsARB" no_error="true"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 18839ec70c3..2e3eeaacd15 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2640,7 +2640,7 @@ <glx rop="172"/> </function> - <function name="ReadPixels" es1="1.0" es2="2.0"> + <function name="ReadPixels" es1="1.0" es2="2.0" no_error="true"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 72aa6a3f315..6ce340ddf9b 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -1126,6 +1126,14 @@ read_pixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, } void GLAPIENTRY +_mesa_ReadnPixelsARB_no_error(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, GLsizei bufSize, + GLvoid *pixels) +{ + read_pixels(x, y, width, height, format, type, bufSize, pixels, true); +} + +void GLAPIENTRY _mesa_ReadnPixelsARB(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels) @@ -1134,6 +1142,14 @@ _mesa_ReadnPixelsARB(GLint x, GLint y, GLsizei width, GLsizei height, } void GLAPIENTRY +_mesa_ReadPixels_no_error(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, GLvoid *pixels) +{ + _mesa_ReadnPixelsARB_no_error(x, y, width, height, format, type, INT_MAX, + pixels); +} + +void GLAPIENTRY _mesa_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) { diff --git a/src/mesa/main/readpix.h b/src/mesa/main/readpix.h index 481ad9d9c37..eff8e029044 100644 --- a/src/mesa/main/readpix.h +++ b/src/mesa/main/readpix.h @@ -58,10 +58,19 @@ _mesa_readpixels(struct gl_context *ctx, const struct gl_pixelstore_attrib *packing, GLvoid *pixels); +void GLAPIENTRY +_mesa_ReadPixels_no_error(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, GLvoid *pixels); + extern void GLAPIENTRY _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels ); +void GLAPIENTRY +_mesa_ReadnPixelsARB_no_error(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, GLsizei bufSize, + GLvoid *pixels); + extern void GLAPIENTRY _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, |