diff options
| author | Brian Paul <brianp@vmware.com> | 2010-01-29 08:40:46 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-01-29 08:40:46 -0700 |
| commit | 6fea2be7959620fe0a1b28c275a7d960005c8b09 (patch) | |
| tree | 6bbd3af010e71a8fd3093d628aae33a206a7c18f | |
| parent | 987dd63b90adc77b2ae580579a9baed4a3d56382 (diff) | |
tnl: check that state is validated before drawing
(cherry picked from commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2)
Conflicts:
src/mesa/tnl/t_draw.c
| -rw-r--r-- | src/mesa/tnl/t_draw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index adc50485c1..812d712b07 100644 --- 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 */ |