Mesa (mesa_7_7_branch): tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()

[Brian Paul]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 766f3ccbda7def1a81a3d07002e500e8bb1a898e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=766f3ccbda7def1a81a3d07002e500e8bb1a898e

Author: Roel Kluin <roel.kluin at gmail.com>
Date:   Tue Jan  5 13:40:40 2010 -0800

tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()

This can never be true.

Signed-off-by: Roel Kluin <roel.kluin at gmail.com>

---

 src/mesa/drivers/dri/tdfx/tdfx_texstate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
index bbd2c8c..3f73787 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
@@ -1314,7 +1314,7 @@ SetupDoubleTexEnvVoodoo3(GLcontext *ctx, int tmu0,
       fxMesa->TexCombine[0].InvertRGB = FXFALSE;
       fxMesa->TexCombine[0].InvertAlpha = FXFALSE;
 
-      if ((baseFormat0 == GL_RGB) && (baseFormat0 == GL_LUMINANCE)) {
+      if ((baseFormat0 == GL_RGB) || (baseFormat0 == GL_LUMINANCE)) {
          fxMesa->AlphaCombine.Function = GR_COMBINE_FUNCTION_LOCAL;
          fxMesa->AlphaCombine.Factor = GR_COMBINE_FACTOR_NONE;
          fxMesa->AlphaCombine.Local = locala;