swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index fae7280efb4c7a3f7e41822b7fc376f7fae975cd..08c49f5f2c34870e112d610abad0062b0da3d0b6 100644 (file)
--- 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: