Commit 7b890a36 authored by Andres Rodriguez's avatar Andres Rodriguez Committed by Bas Nieuwenhuizen
Browse files

radv: Fix vkCmdCopyImage for 2d slices into 3d Images

Previously the z offset of the destination image was being ignored. It
should be taken into account when copying into a 3d target.

Also, img_extent_el.depth was being incorrectly clamped to 1 due to the
source image being VK_IMAGE_TYPE_2D. This would result in the blit
failing to iterate over all the 3d slices. Instead we clamp to the
destination image type.

Fixes failures in CTS tests:
Reviewed-by: Bas Nieuwenhuizen's avatarBas Nieuwenhuizen <>
parent 4eae3597
...@@ -369,7 +369,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer, ...@@ -369,7 +369,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
const VkOffset3D src_offset_el = const VkOffset3D src_offset_el =
meta_region_offset_el(src_image, &pRegions[r].srcOffset); meta_region_offset_el(src_image, &pRegions[r].srcOffset);
const VkExtent3D img_extent_el = const VkExtent3D img_extent_el =
meta_region_extent_el(src_image, &pRegions[r].extent); meta_region_extent_el(dest_image, &pRegions[r].extent);
/* Start creating blit rect */ /* Start creating blit rect */
struct radv_meta_blit2d_rect rect = { struct radv_meta_blit2d_rect rect = {
...@@ -377,6 +377,9 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer, ...@@ -377,6 +377,9 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
.height = img_extent_el.height, .height = img_extent_el.height,
}; };
if (dest_image->type == VK_IMAGE_TYPE_3D)
b_dst.layer = dst_offset_el.z;
/* Loop through each 3D or array slice */ /* Loop through each 3D or array slice */
unsigned num_slices_3d = img_extent_el.depth; unsigned num_slices_3d = img_extent_el.depth;
unsigned num_slices_array = pRegions[r].dstSubresource.layerCount; unsigned num_slices_array = pRegions[r].dstSubresource.layerCount;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment