Mesa (staging/21.3): ac/surface: add more elements to meta equations because HTILE can use them

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 114da12827b513a97a9f0c87cadfc8fdcf1cad49
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=114da12827b513a97a9f0c87cadfc8fdcf1cad49

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Feb 21 23:25:06 2022 -0500

ac/surface: add more elements to meta equations because HTILE can use them

according to gfx10SwizzlePattern.h

Fixes: 9fabbf2150253d06d - ac/surface: copy the HTILE equations to the surface

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15098>
(cherry picked from commit 79a7ab642ac1e103c9b00e197105eb3f10c6c523)

---

 .pick_status.json           | 2 +-
 src/amd/common/ac_surface.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 396f7b67686..3b74f3fa0a4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -265,7 +265,7 @@
         "description": "ac/surface: add more elements to meta equations because HTILE can use them",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9fabbf2150253d06dedca3bfa6cb852197e193ac"
     },
diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h
index 3f69b34991f..08556163db3 100644
--- a/src/amd/common/ac_surface.h
+++ b/src/amd/common/ac_surface.h
@@ -223,7 +223,7 @@ struct gfx9_meta_equation {
        * The gfx10 HTILE equation is chip-specific, it requires 64KB_Z_X, and it varies with:
        * - number of samples
        */
-      uint16_t gfx10_bits[60];
+      uint16_t gfx10_bits[64];
    } u;
 };