diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2004-12-17 15:55:17 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2004-12-17 15:55:17 +0000 |
| commit | 3d0487980196d386e75235fe9be0513546083613 (patch) | |
| tree | 2bdee3ce6a8092a86e42731b8a585e580c4d4273 /src/mesa/drivers/dri/savage/savagetex.c | |
| parent | 538541e3002e7271fad21c0e5c21b65c0db90e45 (diff) | |
Made debugging output controllable via environment variable
SAVAGE_DEBUG. Added fallback debugs. Added no_rast option to disable
hardware rasterization (everything as software fallback).
Diffstat (limited to 'src/mesa/drivers/dri/savage/savagetex.c')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagetex.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c index ade318cdc9..7c4257c8ba 100644 --- a/src/mesa/drivers/dri/savage/savagetex.c +++ b/src/mesa/drivers/dri/savage/savagetex.c @@ -1434,7 +1434,6 @@ static void savageUpdateTextureState_s4( GLcontext *ctx ) if (imesa->CurrentTexObj[1]) imesa->CurrentTexObj[1]->bound &= ~2; imesa->CurrentTexObj[0] = 0; imesa->CurrentTexObj[1] = 0; - FALLBACK (ctx, SAVAGE_FALLBACK_TEXTURE, GL_FALSE); savageUpdateTex0State_s4( ctx ); savageUpdateTex1State_s4( ctx ); imesa->dirty |= (SAVAGE_UPLOAD_CTX | @@ -1446,18 +1445,15 @@ static void savageUpdateTextureState_s3d( GLcontext *ctx ) savageContextPtr imesa = SAVAGE_CONTEXT(ctx); if (imesa->CurrentTexObj[0]) imesa->CurrentTexObj[0]->bound &= ~1; imesa->CurrentTexObj[0] = 0; - if (ctx->Texture.Unit[1]._ReallyEnabled) { - FALLBACK (ctx, SAVAGE_FALLBACK_TEXTURE, GL_TRUE); - } else { - FALLBACK (ctx, SAVAGE_FALLBACK_TEXTURE, GL_FALSE); - savageUpdateTexState_s3d( ctx ); - imesa->dirty |= (SAVAGE_UPLOAD_CTX | - SAVAGE_UPLOAD_TEX0); - } + savageUpdateTexState_s3d( ctx ); + imesa->dirty |= (SAVAGE_UPLOAD_CTX | + SAVAGE_UPLOAD_TEX0); } void savageUpdateTextureState( GLcontext *ctx) { savageContextPtr imesa = SAVAGE_CONTEXT( ctx ); + FALLBACK (ctx, SAVAGE_FALLBACK_TEXTURE, GL_FALSE); + FALLBACK(ctx, SAVAGE_FALLBACK_PROJ_TEXTURE, GL_FALSE); if (imesa->savageScreen->chipset >= S3_SAVAGE4) savageUpdateTextureState_s4 (ctx); else |