OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1f6f82
)
vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
author
Brian Paul
<brianp@vmware.com>
Thu, 21 May 2009 15:52:33 +0000
(09:52 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 21 May 2009 22:10:45 +0000
(16:10 -0600)
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
patch
|
blob
|
history
diff --git
a/src/mesa/vbo/vbo_context.h
b/src/mesa/vbo/vbo_context.h
index
1d5e929
..
7e366d4
100644
(file)
--- 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