summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-05-11 16:30:02 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-05-11 16:30:02 +0000
commit1e5772f0ba7300e19d1980c0e30e358e71c5c685 (patch)
tree3a583478bc6d1a4f9e402ee869f6e44aaae8cf80
parentac6728d2d9208c4e8147b1ebfde50efdf37a8428 (diff)
Don't let FragmentProgram._Active influence choice of vertex vs pixel
fog.
-rw-r--r--src/mesa/swrast/s_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 00c4ae4bc9..4a4d1b880a 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));
}