AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support to glRead*Pixels*()

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset
2017-07-18 17:30:54 +02:00
parent 333663f601
commit fee507b909
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mapi/glapi/gen/ARB_robustness.xml
+1 -1
View File
@@ -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"/>
src/mapi/glapi/gen/gl_API.xml
+1 -1
View File
@@ -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"/>
src/mesa/main/readpix.c
+16
View File
@@ -1125,6 +1125,14 @@ read_pixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,
format, type, &clippedPacking, pixels);
}
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,
@@ -1133,6 +1141,14 @@ _mesa_ReadnPixelsARB(GLint x, GLint y, GLsizei width, GLsizei height,
read_pixels(x, y, width, height, format, type, bufSize, pixels, false);
}
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)
src/mesa/main/readpix.h
+9
View File
@@ -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,