prevent run_arb_vertex_program from running tnl programs unless ctx->_MaintainTnlProgram is set

This commit is contained in:
Aapo Tahkola
2006-06-06 22:24:12 +00:00
parent 9ba2006594
commit 9248882ca2
6 changed files with 19 additions and 16 deletions

View File

@@ -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;