commit 3faa7db05332395097ea5dcccfc0d044cbf74101
author Iago Toral Quiroga <itoral@igalia.com> Wed Mar 25 08:23:45 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:28 2020 +0000
tree fea7b656a92383bc6bf33361f9f9d4648235e234
parent 7de80fad741f5a705043240a5213a7a9c4757715

v3dv: fix incorrect image slice selection

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

src/broadcom/vulkan/v3dv_meta_copy.c

diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index 6f83b07..79d71ac 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -221,11 +221,10 @@
       uint32_t clear_pad = 0;
       if (clear_info->image) {
          const struct v3dv_image *image = clear_info->image;
-         if (image->slices[clear_info->layer].tiling == VC5_TILING_UIF_NO_XOR ||
-             image->slices[clear_info->layer].tiling == VC5_TILING_UIF_XOR) {
-            const struct v3d_resource_slice *slice =
-               &image->slices[clear_info->level];
-
+         const struct v3d_resource_slice *slice =
+            &image->slices[clear_info->level];
+         if (slice->tiling == VC5_TILING_UIF_NO_XOR ||
+             slice->tiling == VC5_TILING_UIF_XOR) {
             int uif_block_height = v3d_utile_height(image->cpp) * 2;
 
             uint32_t implicit_padded_height =