Mesa (main): intel/blorp: Use isl_surf_get_image_offset_B_tile_el in ccs_ambiguate

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3f7f6b878c1584d5e0cb69e6e880891b70fa7053
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f7f6b878c1584d5e0cb69e6e880891b70fa7053

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Feb 21 02:23:52 2018 -0800

intel/blorp: Use isl_surf_get_image_offset_B_tile_el in ccs_ambiguate

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11330>

---

 src/intel/blorp/blorp_clear.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index 9661df2f4d4..ad3fa3c352d 100644
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -1309,12 +1309,8 @@ blorp_ccs_ambiguate(struct blorp_batch *batch,
    }
 
    uint32_t offset_B, x_offset_el, y_offset_el;
-   isl_surf_get_image_offset_el(surf->aux_surf, level, layer, z,
-                                &x_offset_el, &y_offset_el);
-   isl_tiling_get_intratile_offset_el(surf->aux_surf->tiling, aux_fmtl->bpb,
-                                      surf->aux_surf->row_pitch_B,
-                                      x_offset_el, y_offset_el,
-                                      &offset_B, &x_offset_el, &y_offset_el);
+   isl_surf_get_image_offset_B_tile_el(surf->aux_surf, level, layer, z,
+                                       &offset_B, &x_offset_el, &y_offset_el);
    params.dst.addr.offset += offset_B;
 
    const uint32_t width_px =