<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Nov 15, 2016 at 5:35 PM, Ben Widawsky <span dir="ltr"><<a href="mailto:benjamin.widawsky@intel.com" target="_blank">benjamin.widawsky@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ben Widawsky <<a href="mailto:ben@bwidawsk.net">ben@bwidawsk.net</a>><br>
<br>
When 1 BO is used for aux data, it needs to point to the correct offset,<br>
which will not be the BOs offset but instead an offset from the BOs<br>
offset. Since today there are always multiple BOs for aux, this doesn't<br>
actually change anything.<br>
<br>
Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br>
Signed-off-by: Ben Widawsky <<a href="mailto:ben@bwidawsk.net">ben@bwidawsk.net</a>><br>
---<br>
src/mesa/drivers/dri/i965/brw_<wbr>wm_surface_state.c | 5 +++--<br>
1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
index 4c2d11d..0cf9181 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
@@ -152,10 +152,11 @@ brw_emit_surface_state(struct brw_context *brw,<br>
if (mt->mcs_buf) {<br>
assert(mt->mcs_buf->offset == 0);<br>
aux_bo = mt->mcs_buf->bo;<br>
- aux_offset = mt->mcs_buf->bo->offset64;<br>
+ aux_offset = mt->mcs_buf->bo->offset64 + mt->mcs_buf->offset;<br>
} else {<br>
aux_bo = mt->hiz_buf-><a href="http://aux_base.bo" rel="noreferrer" target="_blank">aux_base.bo</a>;<br>
- aux_offset = mt->hiz_buf->aux_base.bo-><wbr>offset64;<br>
+ aux_offset = mt->hiz_buf->aux_base.bo-><wbr>offset64 +<br>
+ mt->hiz_buf->mt->offset;<br></blockquote><div><br></div><div>Ugh... hiz is messed up... Sadly, hiz_buf->mt may not always exist so we can't add it unconditionally here. Yes, that's stupid.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
}<br>
<br>
/* We only really need a clear color if we also have an auxiliary<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.2<br>
<br>
</font></span></blockquote></div><br></div></div>