Module: Mesa Branch: mesa_7_5_branch Commit: ad0514b24df196e40d5ba7bb41f3bacce0b86a31 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad0514b24df196e40d5ba7bb41f3bacce0b86a31
Author: Brian Paul <[email protected]> Date: Thu May 21 09:52:33 2009 -0600 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 dda82137d28aba846dda73da230871c115e30aaf) --- src/mesa/vbo/vbo_context.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index bf405eb..5c85161 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
