From 8a39fdd7e6426fe77fe4b8786706fcb7b45c9ee4 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 23 Dec 2017 11:43:49 +0100 Subject: [PATCH] radv: Always use fragment resolve if dest uses DCC. HW resolve does not support it either. Fixes: 2a04f5481df "radv/meta: select resolve paths" Reviewed-by: Dave Airlie (cherry picked from commit a636208ace00e5ba7ddb331362b3e95fd4cea422) --- src/amd/vulkan/radv_meta_resolve.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index 254861ad18a..27d6c3a91bc 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -300,11 +300,10 @@ static void radv_pick_resolve_method_images(struct radv_image *src_image, enum radv_resolve_method *method) { - if (dest_image->surface.micro_tile_mode != src_image->surface.micro_tile_mode) { - if (dest_image->surface.num_dcc_levels > 0) - *method = RESOLVE_FRAGMENT; - else - *method = RESOLVE_COMPUTE; + if (dest_image->surface.num_dcc_levels > 0) { + *method = RESOLVE_FRAGMENT; + } else if (dest_image->surface.micro_tile_mode != src_image->surface.micro_tile_mode) { + *method = RESOLVE_COMPUTE; } }