diff options
| author | Roel Kluin <[email protected]> | 2010-01-05 13:40:40 -0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-05 14:42:28 -0700 |
| commit | 766f3ccbda7def1a81a3d07002e500e8bb1a898e (patch) | |
| tree | 4e45a40cd75257b7a5482c190c2cbd0fc30154e0 /src/mesa/drivers | |
| parent | 9f544394c1d059ce09c8bb2b5e11f5e871c7915f (diff) | |
tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
This can never be true.
Signed-off-by: Roel Kluin <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | 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 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; |