From 9248882ca27b289180a76262aa3d9b26c0cb0e8b Mon Sep 17 00:00:00 2001
From: Aapo Tahkola <aet@rasterburn.org>
Date: Tue, 6 Jun 2006 22:24:12 +0000
Subject: prevent run_arb_vertex_program from running tnl programs unless
 ctx->_MaintainTnlProgram is set

---
 src/mesa/tnl/t_vb_arbprogram.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index d034929fe0..0b39f77ae8 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1237,7 +1237,10 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
    if (ctx->ShaderObjects._VertexShaderPresent)
       return GL_TRUE;
 
-   program = (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : ctx->_TnlProgram);
+   program = (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : 0);
+   if (!program && ctx->_MaintainTnlProgram) {
+      program = ctx->_TnlProgram;
+   }
    if (!program || program->IsNVProgram)
       return GL_TRUE;   
 
-- 
cgit v1.2.3