summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian <brian@nostromo.localnet.net>2007-03-27 09:51:52 -0600
committerBrian <brian@nostromo.localnet.net>2007-03-27 09:51:52 -0600
commit3e45db67294faaf0a06c42bdd6dbdb96f87c8801 (patch)
treeb8dc873e8449e4f53e0acab6d410f8ad0b60e68c /src/mesa/tnl
parent3b8ab881312f36a948913653ed3c471017f811f0 (diff)
Restore the UseTexEnvProgram logic.
Was removed during glsl-compiler work. Still need to go back and revisit this because of the interaction with fragment shaders...
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 fa42a3df98..b7c2c6f9bd 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._Current &&
+ (ctx->FragmentProgram._Active &&
(ctx->FragmentProgram._Current->FogOption != GL_NONE ||
ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_FOGC)))
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );