From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 11 May 2005 15:18:23 +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=9d148e6b2be33fe7ac72aaa3be239dc1bc8878a9;p=mesa.git

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

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 6019eff9902..a90a8fb6cd2 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1280,7 +1280,7 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
 
    ASSERT(span->arrayMask & SPAN_RGBA);
 
-   if (!ctx->FragmentProgram._Active) {
+   if (!ctx->FragmentProgram._Enabled) {
       /* Add base and specular colors */
       if (ctx->Fog.ColorSumEnabled ||
           (ctx->Light.Enabled &&