summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-04-09 15:31:48 -0600
committerBrian Paul <brianp@vmware.com>2009-04-09 20:37:48 -0600
commit6c2d1e68395da7fd7f1bd8b777e075388d6964f4 (patch)
treecdbe547cbaaacf6e536374461305eb44664b0ff5 /src/mesa/swrast
parent92d3b2a4da914a64bf0de4be4843a8524b1a8af6 (diff)
swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_texcombine.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index fae7280efb..08c49f5f2c 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -408,17 +408,10 @@ texture_combine( GLcontext *ctx, GLuint unit, GLuint n,
/* this produces a fixed rgba color, and the coord calc is done elsewhere */
for (i = 0; i < n; i++) {
/* rgba result is 0,0,0,1 */
-#if CHAN_TYPE == GL_FLOAT
rgba[i][RCOMP] = 0.0;
rgba[i][GCOMP] = 0.0;
rgba[i][BCOMP] = 0.0;
rgba[i][ACOMP] = 1.0;
-#else
- rgba[i][RCOMP] = 0;
- rgba[i][GCOMP] = 0;
- rgba[i][BCOMP] = 0;
- rgba[i][ACOMP] = CHAN_MAX;
-#endif
}
return; /* no alpha processing */
default: