From 6da6fbf15acd5c3171291a77ca4932cfef86ccd8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 26 Apr 2005 20:56:52 +0000
Subject: tweak previous fog/fragment program fix

---
 src/mesa/tnl/t_context.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 8d0437b926..e4d0d04821 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -182,7 +182,9 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
       tnl->render_inputs |= (_TNL_BIT_POS|_TNL_BIT_INDEX);
    }
     
-   if (ctx->Fog.Enabled || ctx->FragmentProgram.Current->FogOption != GL_NONE)
+   if (ctx->Fog.Enabled ||
+       (ctx->FragmentProgram.Enabled &&
+        ctx->FragmentProgram.Current->FogOption != GL_NONE))
       tnl->render_inputs |= _TNL_BIT_FOG;
 
    if (ctx->Polygon.FrontMode != GL_FILL || 
-- 
cgit v1.2.3