diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2006-06-06 22:24:12 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2006-06-06 22:24:12 +0000 |
| commit | 9248882ca27b289180a76262aa3d9b26c0cb0e8b (patch) | |
| tree | 4be41552706b53802d8a034e70c132d98cd7a827 /src/mesa/tnl/t_vb_arbprogram.c | |
| parent | 9ba2006594a54173956b2af69055f633fa813bf8 (diff) | |
prevent run_arb_vertex_program from running tnl programs unless ctx->_MaintainTnlProgram is set
Diffstat (limited to 'src/mesa/tnl/t_vb_arbprogram.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |