projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e39a334
)
s/GLuint/GLint/
author
Brian Paul
<brian.paul@tungstengraphics.com>
Fri, 29 Aug 2003 14:45:45 +0000
(14:45 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Fri, 29 Aug 2003 14:45:45 +0000
(14:45 +0000)
src/mesa/swrast/s_texture.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_texture.c
b/src/mesa/swrast/s_texture.c
index 36f2975312dfccf751c55a3b3203983214521f93..6f38aab7f0af18fa2a2c5ad167dd6df5f273cc9f 100644
(file)
--- 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
- GL
u
int 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);