summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-04-26 20:56:52 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-04-26 20:56:52 +0000
commit6da6fbf15acd5c3171291a77ca4932cfef86ccd8 (patch)
tree53c883573b41723f395c97be353ddbb8edea59e2
parentaf96b5fb510526882d0e92e36a370e5965a33f1c (diff)
tweak previous fog/fragment program fix
-rw-r--r--src/mesa/tnl/t_context.c4
1 files changed, 3 insertions, 1 deletions
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 ||