From: Ben Widawsky Date: Wed, 16 Nov 2016 01:35:37 +0000 (-0800) Subject: i965: "Fix" aux offsets X-Git-Tag: upstream/17.1.0~4652 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d241085f723402120b4b47e939fe77020a16d80;p=platform%2Fupstream%2Fmesa.git i965: "Fix" aux offsets When 1 BO is used for aux data, it needs to point to the correct offset, which will not be the BOs offset but instead an offset from the BOs offset. Since today there are always multiple BOs for aux, this doesn't actually change anything. Cc: Jason Ekstrand Signed-off-by: Ben Widawsky Reviewed-by: Lionel Landwerlin --- 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 02ccc1a..77198ae 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -145,10 +145,11 @@ brw_emit_surface_state(struct brw_context *brw, if (mt->mcs_buf) { assert(mt->mcs_buf->offset == 0); aux_bo = mt->mcs_buf->bo; - aux_offset = mt->mcs_buf->bo->offset64; + aux_offset = mt->mcs_buf->bo->offset64 + mt->mcs_buf->offset; } else { aux_bo = mt->hiz_buf->aux_base.bo; - aux_offset = mt->hiz_buf->aux_base.bo->offset64; + aux_offset = mt->hiz_buf->aux_base.bo->offset64 + + mt->hiz_buf->mt->offset; } /* We only really need a clear color if we also have an auxiliary