From 3e45db67294faaf0a06c42bdd6dbdb96f87c8801 Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 27 Mar 2007 09:51:52 -0600 Subject: 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... --- src/mesa/tnl/t_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/tnl/t_context.c') 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 ); -- cgit v1.2.3