diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-21 09:52:33 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-21 16:10:45 -0600 |
| commit | dda82137d28aba846dda73da230871c115e30aaf (patch) | |
| tree | c73eb0ccecdcf4e3752f2fde059f68bb93a83e33 /src/mesa/vbo | |
| parent | a1f6f82e829d14a9b730f1761ebfc11b4409cb51 (diff) | |
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.
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | 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 1d5e929e84..7e366d474d 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 |