Mesa (master): st/mesa: check that state is validated before drawing

Brian Paul brianp at kemper.freedesktop.org
Fri Jan 29 15:44:59 UTC 2010


Module: Mesa
Branch: master
Commit: 987dd63b90adc77b2ae580579a9baed4a3d56382
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=987dd63b90adc77b2ae580579a9baed4a3d56382

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 29 08:39:47 2010 -0700

st/mesa: check that state is validated before drawing

(cherry picked from commit 4d1234e22242529c8d85f5ef0cf826af41a91570)

Conflicts:

	src/mesa/state_tracker/st_draw.c

---

 src/mesa/state_tracker/st_draw.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index b0d5b99..381c684 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))




More information about the mesa-commit mailing list