commit 83336adacad74c5a121f265a599d7e84e70bb2a4
author Iago Toral Quiroga <itoral@igalia.com> Tue Sep 01 13:01:49 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:33 2020 +0000
tree 0bd4dda7e30cb723edfbc53aedc73c0e454be109
parent 4cc7d6a85f2eccf90307989bbdae6fc9b0a301c0

v3dv: fix offset computed by vkGetImageSubresourceLayout for array images

Fixes:
dEQP-VK.image.subresource_layout.2d_array.*

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

src/broadcom/vulkan/v3dv_image.c

diff --git a/src/broadcom/vulkan/v3dv_image.c b/src/broadcom/vulkan/v3dv_image.c
index 71c0e78..cefd22e 100644
--- a/src/broadcom/vulkan/v3dv_image.c
+++ b/src/broadcom/vulkan/v3dv_image.c
@@ -352,7 +352,8 @@
 
    const struct v3d_resource_slice *slice =
       &image->slices[subresource->mipLevel];
-   layout->offset = slice->offset;
+   layout->offset =
+      v3dv_layer_offset(image, subresource->mipLevel, subresource->arrayLayer);
    layout->rowPitch = slice->stride;
    layout->depthPitch = image->cube_map_stride;
    layout->arrayPitch = image->cube_map_stride;