Mesa (master): Partial revert "i965: "Fix" aux offsets"

[Ben Widawsky]

Module: Mesa
Branch: master
Commit: 0272f76741e6311aa12a79fa24c3ace323236941
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0272f76741e6311aa12a79fa24c3ace323236941

Author: Ben Widawsky <ben at bwidawsk.net>
Date:   Wed Nov 16 11:39:29 2016 -0800

Partial revert "i965: "Fix" aux offsets"

This partially reverts commit 0d241085f723402120b4b47e939fe77020a16d80.

HiZ buffer cannot do this properly now, and it's not required, so remove
it.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 +--
 1 file changed, 1 insertion(+), 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 77198ae..835a468 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -148,8 +148,7 @@ brw_emit_surface_state(struct brw_context *brw,
          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 +
-                      mt->hiz_buf->mt->offset;
+         aux_offset = mt->hiz_buf->aux_base.bo->offset64;
       }
 
       /* We only really need a clear color if we also have an auxiliary