Mesa (master): mesa: add casts to fix unpack_SIGNED_GR1616()

Brian Paul brianp at kemper.freedesktop.org
Fri Dec 2 14:52:47 UTC 2011


Module: Mesa
Branch: master
Commit: 19b102517234cc28056ce366a159d18eadab043f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19b102517234cc28056ce366a159d18eadab043f

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec  1 16:37:49 2011 -0700

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 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 565a8d0..f821c2b 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;
    }




More information about the mesa-commit mailing list