From 6fea2be7959620fe0a1b28c275a7d960005c8b09 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 29 Jan 2010 08:40:46 -0700 Subject: tnl: check that state is validated before drawing (cherry picked from commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2) Conflicts: src/mesa/tnl/t_draw.c --- src/mesa/tnl/t_draw.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/mesa/tnl') 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 */ -- cgit v1.2.3