Mesa (master): ac/surface: Fix depth import on GFX6-GFX8.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Aug 13 23:29:15 2020 +0200

ac/surface: Fix depth import on GFX6-GFX8.

Lets just do depth interop imports by convention between radv and
radeonsi for now. The only thing using this should be Vulkan interop
anyway.

CC: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6617>

---

 src/amd/common/ac_surface.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index df5b35b9175..5a073c8203b 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -975,7 +975,8 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *i
 
    /* Set preferred macrotile parameters. This is usually required
     * for shared resources. This is for 2D tiling only. */
-   if (AddrSurfInfoIn.tileMode >= ADDR_TM_2D_TILED_THIN1 && surf->u.legacy.bankw &&
+   if (!(surf->flags & RADEON_SURF_Z_OR_SBUFFER) &&
+       AddrSurfInfoIn.tileMode >= ADDR_TM_2D_TILED_THIN1 && surf->u.legacy.bankw &&
        surf->u.legacy.bankh && surf->u.legacy.mtilea && surf->u.legacy.tile_split) {
       /* If any of these parameters are incorrect, the calculation
        * will fail. */