From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 5 Jan 2010 21:40:40 +0000 (-0800)
Subject: tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=766f3ccbda7def1a81a3d07002e500e8bb1a898e;p=mesa.git

tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()

This can never be true.

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

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
index bbd2c8cfee9..3f737878ed9 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;