summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-12-02 12:15:46 -0800
committerEric Anholt <eric@anholt.net>2009-12-02 16:19:36 -0800
commitb47f7316dab5eb81bc7e60dc93bb5dbe824c43d4 (patch)
treed03467aa73042a53567cb68d2fda3a7eb5799d8d /src/mesa
parent77ff3a5619721cfd917f9fd45e4b3a1c866c578f (diff)
mesa: Fix copy'n'paste problem in al1616 texel fetch.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texfetch_tmp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texfetch_tmp.h b/src/mesa/main/texfetch_tmp.h
index 1f0d436236..e6772c89f3 100644
--- a/src/mesa/main/texfetch_tmp.h
+++ b/src/mesa/main/texfetch_tmp.h
@@ -864,7 +864,7 @@ static void store_texel_al88_rev(struct gl_texture_image *texImage,
static void FETCH(f_al1616)( const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
{
- const GLuint s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+ const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
texel[RCOMP] =
texel[GCOMP] =
texel[BCOMP] = USHORT_TO_FLOAT( s & 0xffff );