From 0d241085f723402120b4b47e939fe77020a16d80 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Tue, 15 Nov 2016 17:35:37 -0800 Subject: [PATCH] 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 --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 5 +++-- 1 file changed, 3 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 02ccc1a82ee..77198ae1644 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 -- 2.30.2