From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Tue, 19 Aug 2008 16:24:27 +0000 (-0700)
Subject: r5xx: Final fog option fix.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a667d67cd6c8b9aa622cd3fce065aca92e1e8a76;p=mesa.git

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?
---

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 820b8dff300..15cd0531618 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);