diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
commit | 6c14cf58343135491068e96575bf4e61a6d34c87 (patch) | |
tree | 0b826725f867a706d558492ac9abf881ab06e7a5 /src/mesa/pipe/i965simple/brw_state_upload.c | |
parent | bf2410ca73d1eabc7134e51855d0b603897229e4 (diff) | |
parent | 4fa7afabc966a3d37324f2f9b03e1cc466db7773 (diff) |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i965simple/brw_state_upload.c')
-rw-r--r-- | src/mesa/pipe/i965simple/brw_state_upload.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/pipe/i965simple/brw_state_upload.c b/src/mesa/pipe/i965simple/brw_state_upload.c index 2502e54929..e727601e1e 100644 --- a/src/mesa/pipe/i965simple/brw_state_upload.c +++ b/src/mesa/pipe/i965simple/brw_state_upload.c @@ -43,7 +43,6 @@ */ const struct brw_tracked_state *atoms[] = { - &brw_wm_input_sizes, &brw_vs_prog, &brw_gs_prog, &brw_clip_prog, @@ -84,8 +83,6 @@ const struct brw_tracked_state *atoms[] = &brw_depthbuffer, &brw_polygon_stipple, - &brw_polygon_stipple_offset, - &brw_line_stipple, &brw_psp_urb_cbs, @@ -192,6 +189,10 @@ void brw_validate_state( struct brw_context *brw ) for (i = 0; i < Elements(atoms); i++) { const struct brw_tracked_state *atom = atoms[i]; + assert(atom->dirty.brw || + atom->dirty.cache); + assert(atom->update); + if (check_state(state, &atom->dirty)) atom->update( brw ); } |