diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-05-31 17:34:27 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-06-30 14:20:24 +0100 |
| commit | d8d8bf1789f634c470e1f3e1af03de1b65d65a54 (patch) | |
| tree | 68fbb76d9c5b5feed2082053ac2f5df1ed3d282c | |
| parent | dc34f9f540e341257da4e6795ef966ad7f4c918f (diff) | |
st_vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
From Brian:
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.
| -rw-r--r-- | src/mesa/state_tracker/st_vbo/st_vbo_context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_vbo/st_vbo_context.h b/src/mesa/state_tracker/st_vbo/st_vbo_context.h index e95fcc599f..5fea22825a 100644 --- a/src/mesa/state_tracker/st_vbo/st_vbo_context.h +++ b/src/mesa/state_tracker/st_vbo/st_vbo_context.h @@ -104,6 +104,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 |