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

[Brian Paul]

Module: Mesa
Branch: master
Commit: dda82137d28aba846dda73da230871c115e30aaf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dda82137d28aba846dda73da230871c115e30aaf

Author: Brian Paul <brianp at vmware.com>
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.

---

 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 1d5e929..7e366d4 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -102,6 +102,8 @@ 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