Mesa (master): swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code

Brian Paul brianp at kemper.freedesktop.org
Fri Apr 10 02:38:03 UTC 2009


Module: Mesa
Branch: master
Commit: 6c2d1e68395da7fd7f1bd8b777e075388d6964f4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c2d1e68395da7fd7f1bd8b777e075388d6964f4

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Apr  9 15:31:48 2009 -0600

swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code

---

 src/mesa/swrast/s_texcombine.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index fae7280..08c49f5 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:




More information about the mesa-commit mailing list