diff options
| author | jhartmann <jhartmann> | 2000-09-28 22:14:07 +0000 |
|---|---|---|
| committer | jhartmann <jhartmann> | 2000-09-28 22:14:07 +0000 |
| commit | cc80ad56c52f5da741923b5afd3881cd7bc193f3 (patch) | |
| tree | b20d43804d4119fe12b371a19a3767f7b7b3f982 /xc/lib/GL/mesa/src/drv/mga | |
| parent | d72a2256f2a3892801bb21368381c6c173b3dd01 (diff) | |
Fixed Lament software fallback
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/mga')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/mga/mgastate.c | 2 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/mga/mgatex.c | 4 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/mga/mgavb.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgastate.c b/xc/lib/GL/mesa/src/drv/mga/mgastate.c index ae8b9ad16..84a4b8135 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgastate.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgastate.c @@ -348,7 +348,7 @@ static void mgaUpdateAlphaMode(GLcontext *ctx) int a = 0; /* determine source of alpha for blending and testing */ - if ( !ctx->Texture.Enabled ) + if ( !ctx->Texture.ReallyEnabled ) a |= AC_alphasel_diffused; else { switch (ctx->Texture.Unit[0].EnvMode) { diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatex.c b/xc/lib/GL/mesa/src/drv/mga/mgatex.c index 7470c26a5..964157d19 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatex.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgatex.c @@ -445,7 +445,7 @@ static void mgaUpdateTextureObject( GLcontext *ctx, int unit ) GLuint source = mmesa->tmu_source[unit]; - enabled = (ctx->Texture.Enabled>>(source*4))&TEXTURE0_ANY; + enabled = (ctx->Texture.ReallyEnabled>>(source*4))&TEXTURE0_ANY; tObj = ctx->Texture.Unit[source].Current; if (enabled != TEXTURE0_2D) { @@ -538,7 +538,7 @@ void mgaUpdateTextureState( GLcontext *ctx ) mmesa->dirty |= MGA_UPLOAD_CTX | MGA_UPLOAD_TEX0; mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_opcod_MASK; - mmesa->Setup[MGA_CTXREG_DWGCTL] |= (ctx->Texture.Enabled + mmesa->Setup[MGA_CTXREG_DWGCTL] |= (ctx->Texture.ReallyEnabled ? DC_opcod_texture_trap : DC_opcod_trap); } diff --git a/xc/lib/GL/mesa/src/drv/mga/mgavb.c b/xc/lib/GL/mesa/src/drv/mga/mgavb.c index 681ebcb8a..dec13514a 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgavb.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgavb.c @@ -268,7 +268,7 @@ void mgaChooseRasterSetupFunc(GLcontext *ctx) mmesa->multitex = 0; mmesa->blend_flags &= ~MGA_BLEND_MULTITEX; - if (ctx->Texture.Enabled & 0xf) { + if (ctx->Texture.ReallyEnabled & 0xf) { /* This doesn't work for non-RGBA textures if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE) funcindex &= ~MGA_RGBA_BIT; @@ -285,8 +285,8 @@ void mgaChooseRasterSetupFunc(GLcontext *ctx) funcindex |= MGA_TEX0_BIT; } - if (ctx->Texture.Enabled & 0xf0) { - if (ctx->Texture.Enabled & 0xf) { + if (ctx->Texture.ReallyEnabled & 0xf0) { + if (ctx->Texture.ReallyEnabled & 0xf) { mmesa->multitex = 1; mmesa->vertsize = 10; mmesa->blend_flags |= MGA_BLEND_MULTITEX; |