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>
This commit is contained in:

committed by
Alan Hourihane

parent
5e116e52a2
commit
510916f509
@@ -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) {
|
||||
|
Reference in New Issue
Block a user