diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
| commit | 3e45db67294faaf0a06c42bdd6dbdb96f87c8801 (patch) | |
| tree | b8dc873e8449e4f53e0acab6d410f8ad0b60e68c /src/mesa/main/context.c | |
| parent | 3b8ab881312f36a948913653ed3c471017f811f0 (diff) | |
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...
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 72c85de7ba..ae1c576248 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1355,14 +1355,16 @@ _mesa_initialize_context(GLcontext *ctx, ctx->TnlModule.SwapCount = 0; #endif + ctx->FragmentProgram._MaintainTexEnvProgram + = (_mesa_getenv("MESA_TEX_PROG") != NULL); + ctx->FragmentProgram._UseTexEnvProgram = ctx->FragmentProgram._MaintainTexEnvProgram; + ctx->VertexProgram._MaintainTnlProgram = (_mesa_getenv("MESA_TNL_PROG") != NULL); - if (ctx->VertexProgram._MaintainTnlProgram) + if (ctx->VertexProgram._MaintainTnlProgram) { /* this is required... */ ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE; - else - ctx->FragmentProgram._MaintainTexEnvProgram - = (_mesa_getenv("MESA_TEX_PROG") != NULL); + } ctx->FirstTimeCurrent = GL_TRUE; |