diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
| commit | 93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch) | |
| tree | 3fdcae64c6a51d6512aa32387846a2f282439855 /mesalib/src/mesa/swrast | |
| parent | 00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff) | |
| parent | 156e37d3879b316329e3e05579414031da2647e2 (diff) | |
| download | vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2 vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/util/makekeys.c
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_readpix.c | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texture.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c index b5618e884..500686798 100644 --- a/mesalib/src/mesa/swrast/s_readpix.c +++ b/mesalib/src/mesa/swrast/s_readpix.c @@ -236,6 +236,7 @@ slow_read_rgba_pixels( struct gl_context *ctx, GLbitfield transferOps ) { struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer; + const gl_format rbFormat = _mesa_get_srgb_format_linear(rb->Format); union { float f[MAX_WIDTH][4]; unsigned int i[MAX_WIDTH][4]; @@ -252,11 +253,10 @@ slow_read_rgba_pixels( struct gl_context *ctx, for (j = 0; j < height; j++) { if (_mesa_is_integer_format(format)) { - _mesa_unpack_int_rgba_row(rb->Format, width, map, rgba.i); + _mesa_unpack_int_rgba_row(rbFormat, width, map, rgba.i); _mesa_pack_rgba_span_int(ctx, width, rgba.i, format, type, dst); } else { - _mesa_unpack_rgba_row(_mesa_get_srgb_format_linear(rb->Format), - width, map, rgba.f); + _mesa_unpack_rgba_row(rbFormat, width, map, rgba.f); _mesa_pack_rgba_span_float(ctx, width, rgba.f, format, type, dst, packing, transferOps); } diff --git a/mesalib/src/mesa/swrast/s_texture.c b/mesalib/src/mesa/swrast/s_texture.c index ba67c6fa4..76a31eeae 100644 --- a/mesalib/src/mesa/swrast/s_texture.c +++ b/mesalib/src/mesa/swrast/s_texture.c @@ -241,7 +241,6 @@ _swrast_map_texture(struct gl_context *ctx, struct gl_texture_object *texObj) /* XXX we'll eventually call _swrast_map_teximage() here */ swImage->Data = swImage->Buffer; - assert(swImage->Buffer); } } } |