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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23143>

diff --git a/src/amd/ci/radv-raven-fails.txt b/src/amd/ci/radv-raven-fails.txt
index 9e8b8e3..d9c0202 100644 (file)
--- a/src/amd/ci/radv-raven-fails.txt
+++ b/src/amd/ci/radv-raven-fails.txt
@@ -33,65 +33,3 @@ dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_vert_buffers1_sets3_im
 dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_vert_buffers2_sets4_imm_samplers,Crash
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed49_tessellation,Fail
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed59_geometry,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_r4g4b4a4_unorm_pack16,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_1_compatible_format_r16_uint,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_420_unorm_plane_2_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_0_compatible_format_r16_uint,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_422_unorm_plane_1_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_422_unorm_plane_2_compatible_format_r8g8_unorm,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16_r16_3plane_444_unorm_plane_0_compatible_format_r10x6_unorm_pack16,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_1_compatible_format_r8g8_unorm,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.g16_b16_r16_3plane_444_unorm_plane_2_compatible_format_r16_uint,Fail
-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_0_compatible_format_r8g8_unorm,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_1_compatible_format_r32_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_0_compatible_format_r16_uint,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_b16r16_2plane_422_unorm_plane_1_compatible_format_r8g8b8a8_unorm,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8_r8_3plane_420_unorm_plane_0_compatible_format_r8_sint,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_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
-dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_420_unorm_plane_0_compatible_format_r8_sint,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_compatible_format_r8_sint,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_r16_uint,Fail
-dEQP-VK.ycbcr.plane_view.memory_alias.g8_b8r8_2plane_422_unorm_plane_1_compatible_format_r8g8_uint,Fail

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index ecc361e..ce6c1b2 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1735,7 +1735,8 @@ radv_get_ac_surf_info(struct radv_device *device, const struct radv_image *image
    info.num_channels = vk_format_get_nr_components(image->vk.format);
 
    if (!vk_format_is_depth_or_stencil(image->vk.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)) &&
        image->vk.tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
       info.surf_index = &device->image_mrt_offset_counter;
    }