summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-05-18 22:31:19 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-05-18 22:31:19 +0000
commit23a5c57ceec4e7d555f1896a7ca825a9ac9969f6 (patch)
tree55de6a7ffdfe312460925c2a193df6316924a7f3 /src/mesa
parent0ca9082cbdf3c7a646a516b73b852fe7a8fd504c (diff)
minor simplification
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_texcombine.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index d8b897f211..ac26c9cebb 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -72,13 +72,11 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
#if CHAN_TYPE == GL_FLOAT
const GLchan RGBmult = (GLfloat) (1 << RGBshift);
const GLchan Amult = (GLfloat) (1 << Ashift);
- static const GLchan one[4] = { 1.0, 1.0, 1.0, 1.0 };
- static const GLchan zero[4] = { 0.0, 0.0, 0.0, 0.0 };
#else
const GLint half = (CHAN_MAX + 1) / 2;
+#endif
static const GLchan one[4] = { CHAN_MAX, CHAN_MAX, CHAN_MAX, CHAN_MAX };
static const GLchan zero[4] = { 0, 0, 0, 0 };
-#endif
const GLuint numColorArgs = textureUnit->_CurrentCombine->_NumArgsRGB;
const GLuint numAlphaArgs = textureUnit->_CurrentCombine->_NumArgsA;
GLchan ccolor[3][MAX_WIDTH][4];
@@ -104,7 +102,6 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
for (j = 0; j < numColorArgs; j++) {
const GLenum srcRGB = textureUnit->_CurrentCombine->SourceRGB[j];
-
switch (srcRGB) {
case GL_TEXTURE:
argRGB[j] = (const GLchan (*)[4])