st/mesa: check that state is validated before drawing
authorBrian Paul <brianp@vmware.com>
Fri, 29 Jan 2010 15:39:47 +0000 (08:39 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 29 Jan 2010 15:39:47 +0000 (08:39 -0700)
(cherry picked from commit 4d1234e22242529c8d85f5ef0cf826af41a91570)

Conflicts:

src/mesa/state_tracker/st_draw.c

src/mesa/state_tracker/st_draw.c

index b0d5b993a77180092a0bb94f84ef701acd3268fb..381c68474d602795adc75ffe7f654b1ac48d2dd0 100644 (file)
@@ -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))