diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2016-12-02 11:10:47 -0800 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2017-01-18 09:38:18 -0800 |
| commit | b0cc55f29831638069407a4c1a5c809b26902ab6 (patch) | |
| tree | 7b270145bcc2492b06a42c633ac0cd7498c686b9 | |
| parent | 65a44a76fc076c4127c0c7b07fb38891e61ea400 (diff) | |
i965: Fix SURFACE_STATE to handle non-zero aux offsets
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 02aea78e72..c7c73774c3 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -143,7 +143,6 @@ brw_emit_surface_state(struct brw_context *brw, aux_surf = &aux_surf_s; if (mt->mcs_buf) { - assert(mt->mcs_buf->offset == 0); aux_bo = mt->mcs_buf->bo; aux_offset = mt->mcs_buf->bo->offset64 + mt->mcs_buf->offset; } else { @@ -185,7 +184,7 @@ brw_emit_surface_state(struct brw_context *brw, uint32_t *aux_addr = state + brw->isl_dev.ss.aux_addr_offset; drm_intel_bo_emit_reloc(brw->batch.bo, *surf_offset + brw->isl_dev.ss.aux_addr_offset, - aux_bo, *aux_addr & 0xfff, + aux_bo, *aux_addr - aux_bo->offset64, read_domains, write_domains); } } |