summaryrefslogtreecommitdiff
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 57fa4a836c..56cb358c4a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -949,7 +949,9 @@ update_program(GLcontext *ctx)
ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
ctx->FragmentProgram._Current = ctx->_TexEnvProgram;
- ctx->FragmentProgram._Active = GL_TRUE;
+
+ if (ctx->_UseTexEnvProgram)
+ ctx->FragmentProgram._Active = GL_TRUE;
}
}