projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
987dd63
)
tnl: check that state is validated before drawing
author
Brian Paul
<brianp@vmware.com>
Fri, 29 Jan 2010 15:40:46 +0000
(08:40 -0700)
committer
Brian Paul
<brianp@vmware.com>
Fri, 29 Jan 2010 15:40:46 +0000
(08:40 -0700)
(cherry picked from commit
9fd3c74724e557bc6ecc851d8552615ab3becfe2
)
Conflicts:
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_draw.c
patch
|
blob
|
history
diff --git
a/src/mesa/tnl/t_draw.c
b/src/mesa/tnl/t_draw.c
index adc50485c1dd4bc656031b26ad9cd4b642828187..812d712b0793584121391a849cab3129da201696 100644
(file)
--- a/
src/mesa/tnl/t_draw.c
+++ b/
src/mesa/tnl/t_draw.c
@@
-402,6
+402,9
@@
void _tnl_draw_prims( GLcontext *ctx,
GLint max_basevertex = prim->basevertex;
GLuint i;
+ /* Mesa core state should have been validated already */
+ assert(ctx->NewState == 0x0);
+
if (!_mesa_check_conditional_render(ctx))
return; /* don't draw */