diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
| commit | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (patch) | |
| tree | 3fd4cc1783510fb6ce17c4c42b4d012014008e5b /mesalib/src/mesa/main/readpix.c | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.gz vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.bz2 vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.zip | |
mesa xserver git update 28 jan 2012
Diffstat (limited to 'mesalib/src/mesa/main/readpix.c')
| -rw-r--r-- | mesalib/src/mesa/main/readpix.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index c1489d211..908a55e70 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -209,15 +209,10 @@ fast_read_rgba_pixels_memcpy( struct gl_context *ctx, GLubyte *dst, *map; int dstStride, stride, j, texelBytes; - if (!_mesa_format_matches_format_and_type(rb->Format, format, type)) + if (!_mesa_format_matches_format_and_type(rb->Format, format, type, + ctx->Pack.SwapBytes)) return GL_FALSE; - /* check for things we can't handle here */ - if (packing->SwapBytes || - packing->LsbFirst) { - return GL_FALSE; - } - dstStride = _mesa_image_row_stride(packing, width, format, type); dst = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height, format, type, 0, 0); |