diff options
author | Brian Paul <brianp@vmware.com> | 2009-09-25 09:00:19 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-09-25 09:00:19 -0600 |
commit | ecf3091cc78638919f1977ccc0307c51b6731385 (patch) | |
tree | e8dca04db94ce566f3dadf148236b5a4d0c901cb /src/mesa/drivers/dri/i965/brw_state_batch.c | |
parent | 5f4f7ad965c40327f16297606ed4f425598bfc2c (diff) | |
parent | 46da1f2c9b67e3b4c3659f2d029140b639571407 (diff) |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_batch.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_batch.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c index 811940edc0..7821898cf9 100644 --- a/src/mesa/drivers/dri/i965/brw_state_batch.c +++ b/src/mesa/drivers/dri/i965/brw_state_batch.c @@ -79,7 +79,7 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw, return GL_TRUE; } -static void clear_batch_cache( struct brw_context *brw ) +void brw_clear_batch_cache( struct brw_context *brw ) { struct brw_cached_batch_item *item = brw->cached_batch_items; @@ -93,18 +93,7 @@ static void clear_batch_cache( struct brw_context *brw ) brw->cached_batch_items = NULL; } -void brw_clear_batch_cache_flush( struct brw_context *brw ) -{ - clear_batch_cache(brw); - - brw->state.dirty.mesa |= ~0; - brw->state.dirty.brw |= ~0; - brw->state.dirty.cache |= ~0; -} - - - void brw_destroy_batch_cache( struct brw_context *brw ) { - clear_batch_cache(brw); + brw_clear_batch_cache(brw); } |