From: Richard Sandiford Date: Tue, 16 Sep 2014 06:27:57 +0000 (+1000) Subject: swrast: Fix handling of MESA_FORMAT_L8A8_SRGB for big-endian X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ecc48f83c8359e3ef64ea40dfb6074f4a1a38dc1;p=mesa.git swrast: Fix handling of MESA_FORMAT_L8A8_SRGB for big-endian Luminance is the least-significant byte of the uint16, rather than the lowest byte in memory. Other parts of mesa already handle this correctly for big-endian, and swrast already handles other MESA_FORMAT_x8y8 formats correctly. This case was just an odd-one-out. Signed-off-by: Richard Sandiford Reviewed-by: Brian Paul Cc: Signed-off-by: Dave Airlie --- diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 72037ec0020..3923e2b6246 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -808,11 +808,11 @@ static void FETCH(L8A8_SRGB)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = - texel[BCOMP] = util_format_srgb_8unorm_to_linear_float(src[0]); - texel[ACOMP] = UBYTE_TO_FLOAT(src[1]); /* linear */ + texel[BCOMP] = util_format_srgb_8unorm_to_linear_float(s & 0xff); + texel[ACOMP] = UBYTE_TO_FLOAT(s >> 8); /* linear */ }