ac/surface: fix broken pitch override on gfx8
authorMarek Olšák <marek.olsak@amd.com>
Fri, 8 May 2020 20:12:56 +0000 (16:12 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Fri, 8 May 2020 20:37:10 +0000 (16:37 -0400)
Fixes: 441eaef6a9e - amd: unify code for overriding offset and stride for imported buffers
Closes: #2920
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4968>

src/amd/common/ac_surface.c

index 86519f216e1f6e4717404d73a0b23f4f2ef08261..98f1276f425a0356c7a16d5c68336280a097b213 100644 (file)
@@ -2207,9 +2207,11 @@ void ac_surface_override_offset_stride(const struct radeon_info *info,
       if (surf->u.gfx9.stencil_offset)
          surf->u.gfx9.stencil_offset += offset;
    } else {
-      surf->u.legacy.level[0].nblk_x = pitch;
-      surf->u.legacy.level[0].slice_size_dw =
-            ((uint64_t)pitch * surf->u.legacy.level[0].nblk_y * surf->bpe) / 4;
+      if (pitch) {
+         surf->u.legacy.level[0].nblk_x = pitch;
+         surf->u.legacy.level[0].slice_size_dw =
+               ((uint64_t)pitch * surf->u.legacy.level[0].nblk_y * surf->bpe) / 4;
+      }
 
       if (offset) {
          for (unsigned i = 0; i < ARRAY_SIZE(surf->u.legacy.level); ++i)