From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 11 May 2005 16:30:02 +0000 (+0000)
Subject: Don't let FragmentProgram._Active influence choice of vertex vs pixel
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e5772f0ba7300e19d1980c0e30e358e71c5c685;p=mesa.git

Don't let FragmentProgram._Active influence choice of vertex vs pixel
fog.
---

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 00c4ae4bc9c..4a4d1b880a3 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -158,7 +158,7 @@ _swrast_update_fog_hint( GLcontext *ctx )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
-                              ctx->FragmentProgram._Active ||
+                              ctx->FragmentProgram._Enabled || /* not _Active! */
 			      (ctx->Hint.Fog == GL_NICEST &&
 			       swrast->AllowPixelFog));
 }