summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-04-26 13:59:09 +0000
committerBrian Paul <[email protected]>2002-04-26 13:59:09 +0000
commitc450d57991628318696ee7a2bd052f91f480cda3 (patch)
tree0cfd8f8da69d101391c91038078232950b3c7aff
parent18385b0f4e9ceb0919c4870cd330c1d8fc240c3e (diff)
replaced GLshort with GLushort in _mesa_sizeof_packed_type()
-rw-r--r--src/mesa/main/image.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index fc77bf88186..4eca41af86b 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.65 2002/03/19 16:47:04 brianp Exp $ */
+/* $Id: image.c,v 1.66 2002/04/26 13:59:09 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -184,17 +184,17 @@ GLint _mesa_sizeof_packed_type( GLenum type )
case GL_UNSIGNED_BYTE_2_3_3_REV:
return sizeof(GLubyte);
case GL_UNSIGNED_SHORT_5_6_5:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_SHORT_5_6_5_REV:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_SHORT_4_4_4_4:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_SHORT_5_5_5_1:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_SHORT_1_5_5_5_REV:
- return sizeof(GLshort);
+ return sizeof(GLushort);
case GL_UNSIGNED_INT_8_8_8_8:
return sizeof(GLuint);
case GL_UNSIGNED_INT_8_8_8_8_REV:
@@ -284,7 +284,7 @@ GLint _mesa_bytes_per_pixel( GLenum format, GLenum type )
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
if (format == GL_RGB || format == GL_BGR)
- return sizeof(GLshort);
+ return sizeof(GLushort);
else
return -1; /* error */
case GL_UNSIGNED_SHORT_4_4_4_4: