From 185d420b27199af2fed3f2b53f95accdf0e0d2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 28 Feb 2024 08:01:04 +0200 Subject: [PATCH] anv: make sure aux is disabled for memory objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9248 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10608 Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_image.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 57d86489394..098392afd14 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1332,11 +1332,6 @@ add_all_surfaces_implicit_layout( if (result != VK_SUCCESS) return result; - /* Disable aux if image supports export without modifiers. */ - if (image->vk.external_handle_types != 0 && - image->vk.tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) - continue; - result = add_aux_surface_if_supported(device, image, plane, plane_format, format_list_info, ANV_OFFSET_IMPLICIT, plane_stride, @@ -1693,6 +1688,11 @@ anv_image_init(struct anv_device *device, struct anv_image *image, isl_extra_usage_flags |= ISL_SURF_USAGE_DISABLE_AUX_BIT; } + /* Disable aux if image supports export without modifiers. */ + if (image->vk.external_handle_types != 0 && + image->vk.tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) + isl_extra_usage_flags |= ISL_SURF_USAGE_DISABLE_AUX_BIT; + const isl_tiling_flags_t isl_tiling_flags = choose_isl_tiling_flags(device->info, create_info, isl_mod_info, image->vk.wsi_legacy_scanout);