From: Eric Anholt Date: Sat, 16 Apr 2011 02:55:38 +0000 (-0700) Subject: swrast: Don't try to adjust_colors for <8bpc when handling R16, RG1616. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b624634dda23d3b94045fb07aea558df39b48ff;p=mesa.git swrast: Don't try to adjust_colors for <8bpc when handling R16, RG1616. The GL_RED and GL_RG were tricking this code into executing, but it's totally unprepared for a 16-bit channel and just rescaled the values down to 0. We don't have anything with <8bit channels alongside >8bit channels, so disabling it should be safe. Reviewed-by: Brian Paul --- diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index cca7ec00802..5604c2e937e 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -344,9 +344,9 @@ read_rgba_pixels( struct gl_context *ctx, _swrast_read_rgba_span(ctx, rb, width, x, y, GL_FLOAT, rgba); /* apply fudge factor for shallow color buffers */ - if (fb->Visual.redBits < 8 || - fb->Visual.greenBits < 8 || - fb->Visual.blueBits < 8) { + if ((fb->Visual.redBits < 8 && fb->Visual.redBits != 0) || + (fb->Visual.greenBits < 8 && fb->Visual.greenBits != 0) || + (fb->Visual.blueBits < 8 && fb->Visual.blueBits != 0)) { adjust_colors(fb, width, rgba); }