From a328e469d328f8b6fd5afdfc21d576fa1a2c43fc Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
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_vb_texmat.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/mesa/tnl/t_vb_texmat.c')

diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index fa9222c0f1..674d36f8cb 100644
--- a/src/mesa/tnl/t_vb_texmat.c
+++ b/src/mesa/tnl/t_vb_texmat.c
@@ -61,10 +61,7 @@ static GLboolean run_texmat_stage( GLcontext *ctx,
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    GLuint i;
 
-   if (ctx->ShaderObjects._VertexShaderPresent)
-      return GL_TRUE;
-
-   if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Enabled) 
+   if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Current) 
       return GL_TRUE;
 
    /* ENABLE_TEXMAT implies that the texture matrix is not the
-- 
cgit v1.2.3