diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-16 23:06:12 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-16 23:06:12 +0000 |
| commit | 7a0f9dbb94947110ed47c3ba4befc2d9ffb1e8c8 (patch) | |
| tree | 7f6660eeda1b814aa13bbd6f9d9761301fc95b5d /src/mesa/drivers/glide/fxsetup.c | |
| parent | 27be87cdff9ecb4a4bdb938f31b7edf28d7cb570 (diff) | |
updated with changes from DRI project CVS
Diffstat (limited to 'src/mesa/drivers/glide/fxsetup.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxsetup.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c index a8ca52d62c..6ebd037fd5 100644 --- a/src/mesa/drivers/glide/fxsetup.c +++ b/src/mesa/drivers/glide/fxsetup.c @@ -407,10 +407,11 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, GR_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION, FXFALSE,FXFALSE); - FX_grTexCombine_NoLock(GR_TMU1, - GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, - GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, - FXFALSE,FXFALSE); + if (fxMesa->haveTwoTMUs) + FX_grTexCombine_NoLock(GR_TMU1, + GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, + GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, + FXFALSE,FXFALSE); fxMesa->tmuSrc=FX_TMU_SPLIT; } else { @@ -1561,28 +1562,28 @@ void fxDDFrontFace(GLcontext *ctx, GLenum mode) static void fxSetupCull(GLcontext *ctx) { - if(ctx->Polygon.CullFlag) { - switch(ctx->Polygon.CullFaceMode) { - case GL_BACK: - if(ctx->Polygon.FrontFace==GL_CCW) - FX_grCullMode(GR_CULL_NEGATIVE); - else - FX_grCullMode(GR_CULL_POSITIVE); - break; - case GL_FRONT: - if(ctx->Polygon.FrontFace==GL_CCW) - FX_grCullMode(GR_CULL_POSITIVE); - else - FX_grCullMode(GR_CULL_NEGATIVE); - break; - case GL_FRONT_AND_BACK: - FX_grCullMode(GR_CULL_DISABLE); - break; - default: - break; - } - } else - FX_grCullMode(GR_CULL_DISABLE); + if (ctx->Polygon.CullFlag) { + switch (ctx->Polygon.CullFaceMode) { + case GL_BACK: + if (ctx->Polygon.FrontFace==GL_CCW) + FX_CONTEXT(ctx)->cullMode=GR_CULL_NEGATIVE; + else + FX_CONTEXT(ctx)->cullMode=GR_CULL_POSITIVE; + break; + case GL_FRONT: + if(ctx->Polygon.FrontFace==GL_CCW) + FX_CONTEXT(ctx)->cullMode=GR_CULL_POSITIVE; + else + FX_CONTEXT(ctx)->cullMode=GR_CULL_NEGATIVE; + break; + case GL_FRONT_AND_BACK: + FX_CONTEXT(ctx)->cullMode=GR_CULL_DISABLE; + break; + default: + break; + } + } else FX_CONTEXT(ctx)->cullMode=GR_CULL_DISABLE; + FX_grCullMode(FX_CONTEXT(ctx)->cullMode); } |