From: Brian <brian@yutani.localnet.net>
Date: Tue, 27 Mar 2007 20:02:04 +0000 (-0600)
Subject: fix a fragment fog regression
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e713ef66ef759d902c08a8cb8eb0e0cfe9373699;p=mesa.git

fix a fragment fog regression
---

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 255c2bdf90d..3017c73cf1f 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -138,7 +138,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
    }
 
    if (ctx->Fog.Enabled ||
-       (ctx->FragmentProgram._Active &&
+       ((ctx->FragmentProgram._Active || ctx->FragmentProgram._Current) &&
         (ctx->FragmentProgram._Current->FogOption != GL_NONE ||
          (ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_FOGC))))
       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );