projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 9f54439)
tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 5 Jan 2010 21:40:40 +0000 (13:40 -0800)
committerBrian Paul <brianp@vmware.com>
Tue, 5 Jan 2010 21:42:28 +0000 (14:42 -0700)
This can never be true.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
src/mesa/drivers/dri/tdfx/tdfx_texstate.c patch | blob | history

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
index bbd2c8cfee94d1563f8290341b5156eda2619ea9..3f737878ed94c8adc30a1d2cc782bf2724fb2c19 100644 (file)
--- 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;