From 12ce72fcfcd07a1da4eb1b8bb2b3ebb1c2e651a7 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 23 Jan 2021 02:36:29 +0100 Subject: [PATCH] radv: Use stricter HW resolve swizzle compat check. D and linear are both DISPLAY micro tiling according to ac_surface but don't work together. This fixes an issue with GFX9+. This fixes the SkQP WritePixelsNonTexture_Gpu test. Fixes: 69ea473eeb9 ("amd/addrlib: update to the latest version") Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_meta_resolve.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index 8258b9a04e8..fc10f6e2f6d 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -353,6 +353,19 @@ enum radv_resolve_method { RESOLVE_FRAGMENT, }; +static bool image_hw_resolve_compat(const struct radv_device *device, + struct radv_image *src_image, + struct radv_image *dst_image) +{ + if (device->physical_device->rad_info.chip_class >= GFX9) { + return dst_image->planes[0].surface.u.gfx9.surf.swizzle_mode == + src_image->planes[0].surface.u.gfx9.surf.swizzle_mode; + } else { + return dst_image->planes[0].surface.micro_tile_mode == + src_image->planes[0].surface.micro_tile_mode; + } +} + static void radv_pick_resolve_method_images(struct radv_device *device, struct radv_image *src_image, VkFormat src_format, @@ -376,8 +389,7 @@ static void radv_pick_resolve_method_images(struct radv_device *device, if (radv_layout_dcc_compressed(device, dest_image, dest_image_layout, dest_render_loop, queue_mask)) { *method = RESOLVE_FRAGMENT; - } else if (dest_image->planes[0].surface.micro_tile_mode != - src_image->planes[0].surface.micro_tile_mode) { + } else if (!image_hw_resolve_compat(device, src_image, dest_image)) { /* The micro tile mode only needs to match for the HW * resolve path which is the default path for non-DCC * resolves.