From: Brian Paul <brianp@vmware.com>
Date: Fri, 29 Jan 2010 15:39:47 +0000 (-0700)
Subject: st/mesa: check that state is validated before drawing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=987dd63b90adc77b2ae580579a9baed4a3d56382;p=mesa.git

st/mesa: check that state is validated before drawing

(cherry picked from commit 4d1234e22242529c8d85f5ef0cf826af41a91570)

Conflicts:

	src/mesa/state_tracker/st_draw.c
---

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index b0d5b993a77..381c68474d6 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -531,6 +531,9 @@ st_draw_vbo(GLcontext *ctx,
    GLboolean userSpace = GL_FALSE;
    GLboolean vertDataEdgeFlags;
 
+   /* Mesa core state should have been validated already */
+   assert(ctx->NewState == 0x0);
+
    /* Gallium probably doesn't want this in some cases. */
    if (!index_bounds_valid)
       if (!vbo_all_varyings_in_vbos(arrays))