Mesa (staging/21.2): intel/isl: Add a missing assert in isl_tiling_get_intratile_offset_sa

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 384184ac70da044a8f1f877a27f24ddf47ad3b75
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=384184ac70da044a8f1f877a27f24ddf47ad3b75

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Jul  7 11:33:49 2021 -0500

intel/isl: Add a missing assert in isl_tiling_get_intratile_offset_sa

Fixes: a4dafe1faddb "intel/isl: Make the offset helpers four dimensional"
Acked-by: Ivan Briano <ivan.briano at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11765>
(cherry picked from commit eb7c28bf24366ae3c30c3a03cbe69747cde49b28)

---

 .pick_status.json   | 2 +-
 src/intel/isl/isl.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index cd13ada9458..967ae805f49 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -31,7 +31,7 @@
         "description": "intel/isl: Add a missing assert in isl_tiling_get_intratile_offset_sa",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a4dafe1faddb569424c7d60fb8da96d0542cedca"
     },
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index e1c9743791a..26faa146832 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -2722,6 +2722,7 @@ isl_tiling_get_intratile_offset_sa(enum isl_tiling tiling,
     */
    assert(total_x_offset_sa % fmtl->bw == 0);
    assert(total_y_offset_sa % fmtl->bh == 0);
+   assert(total_z_offset_sa % fmtl->bd == 0);
    const uint32_t total_x_offset_el = total_x_offset_sa / fmtl->bw;
    const uint32_t total_y_offset_el = total_y_offset_sa / fmtl->bh;
    const uint32_t total_z_offset_el = total_z_offset_sa / fmtl->bd;