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_upload.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_upload.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 414620d0b3..b817b741e7 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -287,6 +287,7 @@ void brw_validate_state( struct brw_context *brw ) if (brw->emit_state_always) { state->mesa |= ~0; state->brw |= ~0; + state->cache |= ~0; } if (brw->fragment_program != ctx->FragmentProgram._Current) { @@ -305,7 +306,7 @@ void brw_validate_state( struct brw_context *brw ) return; if (brw->state.dirty.brw & BRW_NEW_CONTEXT) - brw_clear_batch_cache_flush(brw); + brw_clear_batch_cache(brw); brw->intel.Fallback = 0; |