diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-07 14:09:07 -0800 |
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2009-01-09 11:16:39 +0000 |
| commit | 510916f50961a3a9286807e7f75ba716f3e7f967 (patch) | |
| tree | fc22e88519f847dd069d2431ac59a2a5ba5a3fbc /src/mesa/main/state.c | |
| parent | 5e116e52a2859cca27e984c4ee4fef69a9280e56 (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 <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 3c111759d2..718cd99847 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -254,17 +254,6 @@ update_program(GLcontext *ctx) _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL); } - /* XXX: get rid of _Active flag. - */ -#if 1 - ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled; - if (ctx->FragmentProgram._MaintainTexEnvProgram && - !ctx->FragmentProgram._Enabled) { - if (ctx->FragmentProgram._UseTexEnvProgram) - ctx->FragmentProgram._Active = GL_TRUE; - } -#endif - /* Let the driver know what's happening: */ if (ctx->FragmentProgram._Current != prevFP && ctx->Driver.BindProgram) { |