summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-01-05 13:40:40 -0800
committerBrian Paul <brianp@vmware.com>2010-01-05 14:42:28 -0700
commit766f3ccbda7def1a81a3d07002e500e8bb1a898e (patch)
tree4e45a40cd75257b7a5482c190c2cbd0fc30154e0
parent9f544394c1d059ce09c8bb2b5e11f5e871c7915f (diff)
tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
This can never be true. Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
-rw-r--r--src/mesa/drivers/dri/tdfx/tdfx_texstate.c2
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 bbd2c8cfee..3f737878ed 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;