diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
| commit | 97fb1dadc6c52adeba0ac0684129520288ab794f (patch) | |
| tree | 6a3b54bec00abec5b571087dd001a33d62bf488c /mesalib/src/mesa/main/readpix.h | |
| parent | b99cdb7509cad0b99761d19fe99637177913412b (diff) | |
| parent | d41bc08d1ae8c4784c09d8977816c0fadab1ba52 (diff) | |
| download | vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.gz vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.bz2 vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'mesalib/src/mesa/main/readpix.h')
| -rw-r--r-- | mesalib/src/mesa/main/readpix.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/readpix.h b/mesalib/src/mesa/main/readpix.h index f6bb3d6e2..6caaf3adc 100644 --- a/mesalib/src/mesa/main/readpix.h +++ b/mesalib/src/mesa/main/readpix.h @@ -30,11 +30,20 @@ #include "glheader.h" struct gl_context; +struct gl_pixelstore_attrib; + extern GLboolean _mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type, GLboolean drawing); +extern void +_mesa_readpixels(struct gl_context *ctx, + GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, + const struct gl_pixelstore_attrib *packing, + GLvoid *pixels); + extern void GLAPIENTRY _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels ); |