diff options
| author | Eric Anholt <[email protected]> | 2009-01-07 14:09:07 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2009-01-07 20:34:46 -0800 |
| commit | 8fb727548a652c47d8cf9593e2ae412ef2040119 (patch) | |
| tree | c7157711fcbdf121946592e81438cb46650ee9d7 /src/mesa/tnl | |
| parent | b9b482bd8de366289158a916e16414c5a74819c9 (diff) | |
mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
There was a note in state.c about _Active deserving to die, and there were
potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
Removing both simplifies things.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 8977fadcca2..5e2a58249ec 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -137,7 +137,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) /* fixed-function fog */ RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG ); } - else if (ctx->FragmentProgram._Active || ctx->FragmentProgram._Current) { + else if (ctx->FragmentProgram._Current) { struct gl_fragment_program *fp = ctx->FragmentProgram._Current; if (fp) { if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) { |