summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-09-17 10:50:07 -0600
committerBrian Paul <[email protected]>2011-09-17 10:50:42 -0600
commit3b29631c335bfc4a09c302cfdb7a993097c75096 (patch)
tree11aa71102b03991a949357394b9936aaef48612c /src/mesa
parentee09c1e1c37ba7a143db3300b11ef3b324891563 (diff)
mesa: s/short/ushort/ in unpack_SIGNED_RGBA_16()
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/format_unpack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index c5146f72da0..02b57205ed5 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -947,7 +947,7 @@ unpack_SIGNED_RGBA_16(const void *src, GLfloat dst[4])
static void
unpack_RGBA_16(const void *src, GLfloat dst[4])
{
- const GLshort *s = (const GLshort *) src;
+ const GLushort *s = (const GLushort *) src;
dst[RCOMP] = USHORT_TO_FLOAT( s[0] );
dst[GCOMP] = USHORT_TO_FLOAT( s[1] );
dst[BCOMP] = USHORT_TO_FLOAT( s[2] );