diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2005-12-12 12:57:08 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-12-12 12:57:08 +0000 |
| commit | 40332059e4f7b289e5524d10c5565232d27bffbe (patch) | |
| tree | 4ae2ea2ddf811c2d48c9eb40baa0f2f128d9dd3d /src/mesa/main/state.c | |
| parent | 3e1a5a38ae1d5f47d4a30fde2160ae1132cdd98b (diff) | |
Split _MaintainTexEnvProgram into two flags _Maintain and _Use. This
restores the ability to run the software driver with program TNL but
tradtional swrast.
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 4 |
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; } } |