summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Borca <dborca@users.sourceforge.net>2004-01-08 07:37:21 +0000
committerDaniel Borca <dborca@users.sourceforge.net>2004-01-08 07:37:21 +0000
commita71d4445b4c1666702f308a4ef462f5722ad4b80 (patch)
treebc295e39cdb508c8aa557d63d5c6264e9b880a98
parent1a2a1f039d8730aa45a1f41819a3f3827f905d10 (diff)
envvars to control run-time
-rw-r--r--src/mesa/drivers/glide/fxapi.c16
-rw-r--r--src/mesa/drivers/glide/fxvbtmp.h20
2 files changed, 18 insertions, 18 deletions
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 12b919b2e6..c1dea541e2 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -345,17 +345,17 @@ fxMesaCreateContext(GLuint win,
}
fxMesa->type = voodoo->type;
- fxMesa->HavePalExt = voodoo->HavePalExt;
- fxMesa->HavePixExt = voodoo->HavePixExt;
- fxMesa->HaveTexFmt = voodoo->HaveTexFmt;
- fxMesa->HaveCmbExt = voodoo->HaveCmbExt;
- fxMesa->HaveMirExt = voodoo->HaveMirExt;
- fxMesa->HaveTexUma = voodoo->HaveTexUma;
+ fxMesa->HavePalExt = voodoo->HavePalExt && !getenv("MESA_FX_IGNORE_PALEXT");
+ fxMesa->HavePixExt = voodoo->HavePixExt && !getenv("MESA_FX_IGNORE_PIXEXT");
+ fxMesa->HaveTexFmt = voodoo->HaveTexFmt && !getenv("MESA_FX_IGNORE_TEXFMT");
+ fxMesa->HaveCmbExt = voodoo->HaveCmbExt && !getenv("MESA_FX_IGNORE_CMBEXT");
+ fxMesa->HaveMirExt = voodoo->HaveMirExt && !getenv("MESA_FX_IGNORE_MIREXT");
+ fxMesa->HaveTexUma = voodoo->HaveTexUma && !getenv("MESA_FX_IGNORE_TEXUMA");
fxMesa->Glide = glbHWConfig.Glide;
Glide = &fxMesa->Glide;
fxMesa->HaveTexus2 = Glide->txImgQuantize &&
Glide->txMipQuantize &&
- Glide->txPalToNcc;
+ Glide->txPalToNcc && !getenv("MESA_FX_IGNORE_TEXUS2");
/*
* Pixel tables are used during pixel read-back
@@ -588,7 +588,7 @@ fxMesaCreateContext(GLuint win,
}
END_BOARD_LOCK();
- sprintf(fxMesa->rendererString, "Mesa %s v0.51 %s %dMB FB, %dMB TM, %d TMU, %s",
+ sprintf(fxMesa->rendererString, "Mesa %s v0.60 %s %dMB FB, %dMB TM, %d TMU, %s",
grGetString(GR_RENDERER),
grGetString(GR_HARDWARE),
fbRam,
diff --git a/src/mesa/drivers/glide/fxvbtmp.h b/src/mesa/drivers/glide/fxvbtmp.h
index 9e46f75595..188a71263a 100644
--- a/src/mesa/drivers/glide/fxvbtmp.h
+++ b/src/mesa/drivers/glide/fxvbtmp.h
@@ -248,16 +248,16 @@ static void TAG(interp)( GLcontext *ctx,
}
if (IND & SETUP_TMU0) {
- INTERP_F( t,
- dst->tmuvtx[0].sow,
- out->tmuvtx[0].sow * wout,
+ INTERP_F( t,
+ dst->tmuvtx[0].sow,
+ out->tmuvtx[0].sow * wout,
in->tmuvtx[0].sow * win );
INTERP_F( t,
dst->tmuvtx[0].tow,
- out->tmuvtx[0].tow * wout,
+ out->tmuvtx[0].tow * wout,
in->tmuvtx[0].tow * win );
if (IND & SETUP_PTEX) {
- INTERP_F( t,
+ INTERP_F( t,
dst->tmuvtx[0].oow,
out->tmuvtx[0].oow * wout,
in->tmuvtx[0].oow * win );
@@ -265,16 +265,16 @@ static void TAG(interp)( GLcontext *ctx,
}
if (IND & SETUP_TMU1) {
- INTERP_F( t,
- dst->tmuvtx[1].sow,
- out->tmuvtx[1].sow * wout,
+ INTERP_F( t,
+ dst->tmuvtx[1].sow,
+ out->tmuvtx[1].sow * wout,
in->tmuvtx[1].sow * win );
INTERP_F( t,
dst->tmuvtx[1].tow,
- out->tmuvtx[1].tow * wout,
+ out->tmuvtx[1].tow * wout,
in->tmuvtx[1].tow * win );
if (IND & SETUP_PTEX) {
- INTERP_F( t,
+ INTERP_F( t,
dst->tmuvtx[1].oow,
out->tmuvtx[1].oow * wout,
in->tmuvtx[1].oow * win );