v3dv: fix image addressing calculations to account for suballocation

An image can be suballocated from a larger memory allocation, in which
case we get a memory offset for the start of the bound region at
vkBindImageMemory. Take that offset into account when doing image
addressing calculations.

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

diff --git a/src/broadcom/vulkan/v3dv_image.c b/src/broadcom/vulkan/v3dv_image.c
index bfa5e6a..c0fc31f 100644 (file)
--- a/src/broadcom/vulkan/v3dv_image.c
+++ b/src/broadcom/vulkan/v3dv_image.c
@@ -253,9 +253,9 @@ v3dv_layer_offset(const struct v3dv_image *image, uint32_t level, uint32_t layer
    const struct v3d_resource_slice *slice = &image->slices[level];
 
    if (image->type == VK_IMAGE_TYPE_3D)
-      return slice->offset + layer * slice->size;
+      return image->mem_offset + slice->offset + layer * slice->size;
    else
-      return slice->offset + layer * image->cube_map_stride;
+      return image->mem_offset + slice->offset + layer * image->cube_map_stride;
 }
 
 VkResult