From a667d67cd6c8b9aa622cd3fce065aca92e1e8a76 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Tue, 19 Aug 2008 09:24:27 -0700 Subject: [PATCH] r5xx: Final fog option fix. Is there some kind of git hook we could use to keep me from committing after like 10PM or so? --- src/mesa/drivers/dri/r300/r300_state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 820b8df..15cd053 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -2623,10 +2623,12 @@ static void r500SetupPixelShader(r300ContextPtr rmesa) if (fp->mesa_program.FogOption != GL_NONE) { /* Enable HW fog. Try not to squish GL context. * (Anybody sane remembered to set glFog() opts first!) */ + r300SetFogState(ctx, GL_TRUE); ctx->Fog.Mode = fp->mesa_program.FogOption; r300Fogfv(ctx, GL_FOG_MODE, NULL); - r300SetFogState(ctx, GL_TRUE); - } + } else + /* Make sure HW is matching GL context. */ + r300SetFogState(ctx, ctx->Fog.Enabled); r300SetupTextures(ctx); -- 2.7.4