diff options
| author | Brian <brian@yutani.localnet.net> | 2006-12-13 14:58:13 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2006-12-13 14:58:13 -0700 |
| commit | a328e469d328f8b6fd5afdfc21d576fa1a2c43fc (patch) | |
| tree | 5e5e2a7ef745a97abbbeca7378ea348a0836c49e /src/mesa/tnl/t_vtx_eval.c | |
| parent | fe1d01cb398cbcb5b28a0b222845d3865c4d612b (diff) | |
Checkpoint work for new GLSL compiler back-end.
Among changes:
Remove ctx->FragmentProgram._Active
Remove _UseTexEnvProgram
Move _MaintainTnlProgram, _MaintainTexEnvProgram, _TexEnvProgram and
_TnlProgram fields.
Remove/disable old GLSL interpreter code.
Diffstat (limited to 'src/mesa/tnl/t_vtx_eval.c')
| -rw-r--r-- | src/mesa/tnl/t_vtx_eval.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vtx_eval.c b/src/mesa/tnl/t_vtx_eval.c index 71564076e3..bb621ecbe3 100644 --- a/src/mesa/tnl/t_vtx_eval.c +++ b/src/mesa/tnl/t_vtx_eval.c @@ -123,8 +123,7 @@ void _tnl_update_eval( GLcontext *ctx ) * We do this after the conventional attributes since the spec says that * these generic maps have higher priority. */ - if (ctx->VertexProgram._Enabled && - ctx->VertexProgram._Current && + if (ctx->VertexProgram._Current && ctx->VertexProgram._Current->IsNVProgram) { for (attr = 0; attr < 16; attr++) { if (ctx->Eval.Map1Attrib[attr]) |