summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-29 14:45:45 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-29 14:45:45 +0000
commitd12a871b21adee531661f4cf6561d2ffda685359 (patch)
tree099b9483a2b2a17b51c020d5a5ab2a0664a9e0b2 /src
parente39a334f1aadefdea619d14adb589a5d641bf3c1 (diff)
s/GLuint/GLint/
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 36f2975312..6f38aab7f0 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -3727,7 +3727,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
#if CHAN_TYPE == GL_FLOAT
rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) + arg1[i][ACOMP]) * Amult;
#else
- GLuint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
+ GLint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
+ ((GLuint) arg1[i][ACOMP] << CHAN_BITS))
>> shift;
rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);