summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-27 14:02:04 -0600
committerBrian <brian@yutani.localnet.net>2007-03-27 16:06:47 -0600
commite713ef66ef759d902c08a8cb8eb0e0cfe9373699 (patch)
tree1ce50b83dd04eece2d531bc81753dd724b9e8672 /src/mesa/tnl
parenta0275b0d2c071ed8254c2af3a0c53eec9d3561a6 (diff)
fix a fragment fog regression
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 255c2bdf90..3017c73cf1 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 );