v3dv: fix copy buffer to image TFU path for 3D images

This bug was exposed by the following CTS tests (requires
geometry shaders):
dEQP-VK.geometry.layered.3d.*.readback

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11783>
This commit is contained in:
Iago Toral Quiroga 2021-07-06 07:53:31 +02:00
parent 31a786c80a
commit df1d08533c

View file

@ -1485,7 +1485,11 @@ copy_buffer_to_image_tfu(struct v3dv_cmd_buffer *cmd_buffer,
/* Emit a TFU job per layer to copy */
const uint32_t buffer_stride = width * image->cpp;
for (int i = 0; i < num_layers; i++) {
uint32_t layer = region->imageSubresource.baseArrayLayer + i;
uint32_t layer;
if (image->type != VK_IMAGE_TYPE_3D)
layer = region->imageSubresource.baseArrayLayer + i;
else
layer = region->imageOffset.z + i;
struct drm_v3d_submit_tfu tfu = {
.ios = (height << 16) | width,