diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-01-03 15:59:30 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-01-03 15:59:30 +0000 |
| commit | 6532db986883ea1a431c043126de4947465834a1 (patch) | |
| tree | afff13a66669d89ac029fc3183385c9b1f751bba /src/mesa/swrast/s_texture.c | |
| parent | 3b399df6382d3cfb3cf9bfde4888878bebd2903f (diff) | |
More color macro clean-ups.
FLOAT_TO_CHAN() macro removed.
Diffstat (limited to 'src/mesa/swrast/s_texture.c')
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index bcc5f2677d..29d6b46f4d 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -1,4 +1,4 @@ -/* $Id: s_texture.c,v 1.5 2001/01/02 22:02:52 brianp Exp $ */ +/* $Id: s_texture.c,v 1.6 2001/01/03 15:59:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1841,8 +1841,8 @@ _mesa_texture_combine(const GLcontext *ctx, break; case GL_CONSTANT_EXT: { - GLchan (*c)[4] = ccolor[j]; - GLchan alpha = FLOAT_TO_CHAN(textureUnit->EnvColor[3]); + GLchan alpha, (*c)[4] = ccolor[j]; + UNCLAMPED_FLOAT_TO_CHAN(alpha, textureUnit->EnvColor[3]); for (i = 0; i < n; i++) c[i][ACOMP] = alpha; argA[j] = ccolor[j]; @@ -1865,9 +1865,10 @@ _mesa_texture_combine(const GLcontext *ctx, case GL_CONSTANT_EXT: { GLchan (*c)[4] = ccolor[j]; - const GLchan red = FLOAT_TO_CHAN(textureUnit->EnvColor[0]); - const GLchan green = FLOAT_TO_CHAN(textureUnit->EnvColor[1]); - const GLchan blue = FLOAT_TO_CHAN(textureUnit->EnvColor[2]); + GLchan red, green, blue; + UNCLAMPED_FLOAT_TO_CHAN(red, textureUnit->EnvColor[0]); + UNCLAMPED_FLOAT_TO_CHAN(green, textureUnit->EnvColor[1]); + UNCLAMPED_FLOAT_TO_CHAN(blue, textureUnit->EnvColor[2]); for (i = 0; i < n; i++) { c[i][RCOMP] = red; c[i][GCOMP] = green; |