summaryrefslogtreecommitdiff
path: root/src/mesa/swrast_setup
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-06-06 16:19:25 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-06-06 16:19:25 +0000
commite0107e87a71ffcddc9400287ee675f0011cdc31b (patch)
tree3c9b51be2efbd1060deb76126aa704329d1cbfdd /src/mesa/swrast_setup
parent241afd837c09d42d38a23f9c5e988c50bfacfc30 (diff)
replaced 0xf and 0xf0 with TEXTURE0_ANY and TEXTURE1_ANY
Diffstat (limited to 'src/mesa/swrast_setup')
-rw-r--r--src/mesa/swrast_setup/ss_vb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index f071216801..811c3e70d9 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)