radv: do not use a pipe offset for aliased images

Fixes dEQP-VK.ycbcr.plane_view.memory_alias.* on raven2.

Fixes: 1c06565026 ("radv: expose disjoint image support")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23143>
(cherry picked from commit 57b85b6002)
This commit is contained in:
Chia-I Wu 2023-05-19 15:59:53 -07:00 committed by Eric Engestrom
parent 9a4db70a19
commit 69087bf478
3 changed files with 3 additions and 46 deletions

View file

@ -4666,7 +4666,7 @@
"description": "radv: do not use a pipe offset for aliased images",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1c065650260dadf9c9a981f156459c7f4ce0a007"
},

View file

@ -35,47 +35,3 @@ dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed49_tessellation,Fail
dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed59_geometry,Fail
dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap,Timeout
dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap,Timeout
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r8g8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_1_compatible_format_r8g8b8a8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_1_compatible_format_r8g8b8a8_unorm,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_422_unorm_plane_0_compatible_format_r10x6_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_422_unorm_plane_1_compatible_format_r10x6g10x6_unorm_2pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_0_compatible_format_r16_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_0_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_0_compatible_format_r8g8_unorm,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_1_compatible_format_r10x6_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_2_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_2_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_2_compatible_format_r8g8_unorm,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_2,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_0_compatible_format_r10x6_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_1_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_1_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_1_compatible_format_r8g8_unorm,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_1,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_2_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_2_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_2_compatible_format_r8g8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_0_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_0_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_0_compatible_format_r8g8_unorm,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_0,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_1_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_1_compatible_format_r4g4b4a4_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_1_compatible_format_r8g8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_2_compatible_format_r10x6_unorm_pack16,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_420_unorm_plane_1_compatible_format_r16_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_420_unorm_plane_1,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_422_unorm_plane_0,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_422_unorm_plane_1_compatible_format_r16_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_422_unorm_plane_1_compatible_format_r8g8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_420_unorm_plane_1_compatible_format_r8_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_420_unorm_plane_1_compatible_format_r8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_420_unorm_plane_2_compatible_format_r8_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_422_unorm_plane_0_compatible_format_r8_uint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_422_unorm_plane_1_compatible_format_r8_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_444_unorm_plane_0_compatible_format_r8_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_444_unorm_plane_1_compatible_format_r8_sint,Fail
dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_444_unorm_plane_2,Fail

View file

@ -1967,7 +1967,8 @@ radv_image_create(VkDevice _device, const struct radv_image_create_info *create_
image->shareable = external_info;
if (!vk_format_is_depth_or_stencil(format) && !image->shareable &&
!(image->vk.create_flags & VK_IMAGE_CREATE_SPARSE_ALIASED_BIT) &&
!(image->vk.create_flags & (VK_IMAGE_CREATE_SPARSE_ALIASED_BIT |
VK_IMAGE_CREATE_ALIAS_BIT)) &&
pCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
image->info.surf_index = &device->image_mrt_offset_counter;
}