From a328e469d328f8b6fd5afdfc21d576fa1a2c43fc Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 13 Dec 2006 14:58:13 -0700 Subject: 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. --- src/mesa/tnl/t_vtx_eval.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/tnl/t_vtx_eval.c') diff --git a/src/mesa/tnl/t_vtx_eval.c b/src/mesa/tnl/t_vtx_eval.c index 71564076e37..bb621ecbe39 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]) -- cgit v1.2.3