From 19b102517234cc28056ce366a159d18eadab043f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 1 Dec 2011 16:37:49 -0700 Subject: [PATCH] mesa: add casts to fix unpack_SIGNED_GR1616() We were passing unsigned values to the macro before. --- src/mesa/main/format_unpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c index 565a8d05989..f821c2be4f4 100644 --- a/src/mesa/main/format_unpack.c +++ b/src/mesa/main/format_unpack.c @@ -1195,8 +1195,8 @@ unpack_SIGNED_GR1616(const void *src, GLfloat dst[][4], GLuint n) const GLuint *s = ((const GLuint *) src); GLuint i; for (i = 0; i < n; i++) { - dst[i][RCOMP] = SHORT_TO_FLOAT_TEX( s[i] & 0xffff ); - dst[i][GCOMP] = SHORT_TO_FLOAT_TEX( s[i] >> 16 ); + dst[i][RCOMP] = SHORT_TO_FLOAT_TEX( (GLshort) (s[i] & 0xffff) ); + dst[i][GCOMP] = SHORT_TO_FLOAT_TEX( (GLshort) (s[i] >> 16) ); dst[i][BCOMP] = 0.0F; dst[i][ACOMP] = 1.0F; } -- 2.30.2