diff options
| author | Jordan Justen <[email protected]> | 2014-09-03 14:28:59 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2014-09-04 23:06:27 -0700 |
| commit | 864c463485aafaa2802b18a7427f8b75dc96e3ef (patch) | |
| tree | a8b41434cd3b5b13fff67e85ae54c95fc5f7c62e /src/mesa/drivers/dri/i965/brw_cc.c | |
| parent | 5d8f40a53a58c984906bc6509f01e31cc41ed1da (diff) | |
Revert 5 i965 patches: 8e27a4d2, 373143ed, c5bdf9be, 6f56e142, 88e3d404
Reverts
* "i965: Modify state upload to allow 2 different sets of state atoms."
8e27a4d2b3e4e74e9a77446bce49607433d86be3
* "i965: Modify dirty bit handling to support 2 pipelines."
373143ed9187c4d4ce1e3c486b5dd0880d18ec8b
* "i965: Create a macro for checking a dirty bit."
c5bdf9be1eca190417998d548fd140c1eca37a54
Conflicts:
src/mesa/drivers/dri/i965/brw_context.h
* "i965: Create a macro for setting all dirty bits."
6f56e1424d923fd80c84090fbf4506c9eaaffea1
Conflicts:
src/mesa/drivers/dri/i965/brw_blorp.cpp
src/mesa/drivers/dri/i965/brw_state_cache.c
src/mesa/drivers/dri/i965/brw_state_upload.c
* "i965: Create a macro for setting a dirty bit."
88e3d404dad009d8cff5124cf8acee7daeaceb64
Signed-off-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_cc.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_cc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index 0e31aa2eacc..289f65b5a8a 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -62,7 +62,7 @@ brw_upload_cc_vp(struct brw_context *brw) } } - SET_DIRTY_BIT(cache, CACHE_NEW_CC_VP); + brw->state.dirty.cache |= CACHE_NEW_CC_VP; } const struct brw_tracked_state brw_cc_vp = { @@ -223,7 +223,7 @@ static void upload_cc_unit(struct brw_context *brw) cc->cc4.cc_viewport_state_offset = (brw->batch.bo->offset64 + brw->cc.vp_offset) >> 5; /* reloc */ - SET_DIRTY_BIT(cache, CACHE_NEW_CC_UNIT); + brw->state.dirty.cache |= CACHE_NEW_CC_UNIT; /* Emit CC viewport relocation */ drm_intel_bo_emit_reloc(brw->batch.bo, |