diff options
| author | Brian Paul <[email protected]> | 2002-06-06 16:19:25 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-06-06 16:19:25 +0000 |
| commit | e0107e87a71ffcddc9400287ee675f0011cdc31b (patch) | |
| tree | 3c9b51be2efbd1060deb76126aa704329d1cbfdd | |
| parent | 241afd837c09d42d38a23f9c5e988c50bfacfc30 (diff) | |
replaced 0xf and 0xf0 with TEXTURE0_ANY and TEXTURE1_ANY
| -rw-r--r-- | src/mesa/drivers/glide/fxvb.c | 8 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_vb.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c index 2af5e26a018..4983d5f12b4 100644 --- a/src/mesa/drivers/glide/fxvb.c +++ b/src/mesa/drivers/glide/fxvb.c @@ -1,4 +1,4 @@ -/* $Id: fxvb.c,v 1.11 2001/09/23 16:50:01 brianp Exp $ */ +/* $Id: fxvb.c,v 1.12 2002/06/06 16:19:25 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -342,8 +342,8 @@ void fxChooseVertexState( GLcontext *ctx ) fxMesa->tmu_source[0] = 0; fxMesa->tmu_source[1] = 1; - if (ctx->Texture._ReallyEnabled & 0xf0) { - if (ctx->Texture._ReallyEnabled & 0xf) { + if (ctx->Texture._ReallyEnabled & TEXTURE1_ANY) { + if (ctx->Texture._ReallyEnabled & TEXTURE0_ANY) { ind |= SETUP_TMU1|SETUP_TMU0; } else { @@ -352,7 +352,7 @@ void fxChooseVertexState( GLcontext *ctx ) ind |= SETUP_TMU0; } } - else if (ctx->Texture._ReallyEnabled & 0xf) { + else if (ctx->Texture._ReallyEnabled & TETURE0_ANY) { ind |= SETUP_TMU0; } diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c index f071216801e..811c3e70d92 100644 --- a/src/mesa/swrast_setup/ss_vb.c +++ b/src/mesa/swrast_setup/ss_vb.c @@ -1,4 +1,4 @@ -/* $Id: ss_vb.c,v 1.15 2002/01/06 20:39:03 brianp Exp $ */ +/* $Id: ss_vb.c,v 1.16 2002/06/06 16:19:25 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -386,9 +386,9 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx) if (ctx->Visual.rgbMode) { funcindex = COLOR; - if (ctx->Texture._ReallyEnabled & ~0xf) + if (ctx->Texture._ReallyEnabled & ~TEXTURE0_ANY) funcindex |= MULTITEX; - else if (ctx->Texture._ReallyEnabled & 0xf) + else if (ctx->Texture._ReallyEnabled & TEXTURE0_ANY) funcindex |= TEX0; if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) |