From 69087bf478bf0f0e1232d946b2d368a361469dc6 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 19 May 2023 15:59:53 -0700 Subject: [PATCH] radv: do not use a pipe offset for aliased images Fixes dEQP-VK.ycbcr.plane_view.memory_alias.* on raven2. Fixes: 1c065650260 ("radv: expose disjoint image support") Part-of: (cherry picked from commit 57b85b6002d406cc405a46e70fae93e2754eeed9) --- .pick_status.json | 2 +- src/amd/ci/radv-raven-fails.txt | 44 --------------------------------- src/amd/vulkan/radv_image.c | 3 ++- 3 files changed, 3 insertions(+), 46 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0eba83da0ff..2703fa03eef 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/amd/ci/radv-raven-fails.txt b/src/amd/ci/radv-raven-fails.txt index 557c980485c..8c06e82a71f 100644 --- a/src/amd/ci/radv-raven-fails.txt +++ b/src/amd/ci/radv-raven-fails.txt @@ -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 diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 4b11c6ebf90..c7516cf8536 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -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; }