vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program

If we're running a vertex program to emulated fixed-function, we still need
to treat vertex arrays/attributes as if we're in fixed-function mode.

This should probably be back-ported to Mesa 7.5 after a bit more testing.
(cherry picked from commit dda82137d2)
This commit is contained in:
Brian Paul 2009-05-21 09:52:33 -06:00 committed by Ian Romanick
parent 00e203fe17
commit ad0514b24d

View file

@ -102,6 +102,8 @@ static INLINE GLuint get_program_mode( GLcontext *ctx )
{
if (!ctx->VertexProgram._Current)
return VP_NONE;
else if (ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram)
return VP_NONE;
else if (ctx->VertexProgram._Current->IsNVProgram)
return VP_NV;
else