AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced 0xf and 0xf0 with TEXTURE0_ANY and TEXTURE1_ANY

Browse Source
This commit is contained in:
Brian Paul
2002-06-06 16:19:25 +00:00
parent 241afd837c
commit e0107e87a7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/glide/fxvb.c
+4 -4
View File
@@ -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;
}
src/mesa/swrast_setup/ss_vb.c
+3 -3
View File
@@ -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)