summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-21 09:52:33 -0600
committerIan Romanick <ian.d.romanick@intel.com>2009-06-22 15:15:19 -0700
commitad0514b24df196e40d5ba7bb41f3bacce0b86a31 (patch)
tree741eb868a03e0528f0c4aa7dc7b319099842e4a6 /src
parent00e203fe17cbf2127abc422c785cf9fad3232adb (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. (cherry picked from commit dda82137d28aba846dda73da230871c115e30aaf)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/vbo/vbo_context.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index bf405eb6933..5c85161caa5 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