swrast: fix bad optimization check

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 3b7bbfe25832b0e74f04a820485402d0c63bf2ab..ef2db0dc7e38e5a66d1da1ae57264a4274c7b933 100644 (file)
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -604,7 +604,8 @@ texture_apply( const GLcontext *ctx,
       format = texUnit->_Current->DepthMode;
    }
 
-   if (texUnit->EnvMode != GL_REPLACE) {
+   /* skip chan->float conversion when not needed */
+   if (texUnit->EnvMode != GL_REPLACE || format != GL_RGBA) {
       /* convert GLchan colors to GLfloat */
       for (i = 0; i < n; i++) {
          rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);