diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
| commit | f7eb7329c8efe023b304d5e66b08d1a998973220 (patch) | |
| tree | 290de7865db558d7c85ba03e735e4a135ae69aab /mesalib/src/mesa/main/readpix.c | |
| parent | ceca11a64938e803d2e0d8ccfc030357c3a0121c (diff) | |
| parent | d483a0007d3a25fbf565436f655fa45b4265628a (diff) | |
| download | vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.gz vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.bz2 vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_in.c
Diffstat (limited to 'mesalib/src/mesa/main/readpix.c')
| -rw-r--r-- | mesalib/src/mesa/main/readpix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index 3384d8a38..491854955 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -291,10 +291,14 @@ slow_read_rgba_pixels( struct gl_context *ctx, for (j = 0; j < height; j++) { if (_mesa_is_integer_format(format)) { _mesa_unpack_uint_rgba_row(rbFormat, width, map, (GLuint (*)[4]) rgba); + _mesa_rebase_rgba_uint(width, (GLuint (*)[4]) rgba, + rb->_BaseFormat); _mesa_pack_rgba_span_int(ctx, width, (GLuint (*)[4]) rgba, format, type, dst); } else { _mesa_unpack_rgba_row(rbFormat, width, map, (GLfloat (*)[4]) rgba); + _mesa_rebase_rgba_float(width, (GLfloat (*)[4]) rgba, + rb->_BaseFormat); _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format, type, dst, packing, transferOps); } |