From eaa3da4189b65d960eddc191eeb0ca70d7ce2bae Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 23 Jan 2018 16:07:50 +1000 Subject: [PATCH] radv: don't use hw resolves for r16g16 norm formats. radeonsi has a workaround for this, but it uses a R16A16 format, which vulkan doesn't have, we could probably come up with a work around but for now just avoid hw resolves. Fixes: dEQP-VK.renderpass.suballocation.multisample.r16g16_*norm* Reviewed-by: Bas Nieuwenhuizen Fixes: 2a04f5481d (radv/meta: select resolve paths) Signed-off-by: Dave Airlie (cherry picked from commit c727ea9370adc5362e00208b9f1481764b8ef215) Signed-off-by: Emil Velikov Conflicts: src/amd/vulkan/radv_meta_resolve.c --- src/amd/vulkan/radv_meta_resolve.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index 394b8918862..fca36b122dc 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -347,7 +347,10 @@ static void radv_pick_resolve_method_images(struct radv_image *src_image, enum radv_resolve_method *method) { - if (vk_format_is_int(src_image->vk_format)) + if (src_image->vk_format == VK_FORMAT_R16G16_UNORM || + src_image->vk_format == VK_FORMAT_R16G16_SNORM) + *method = RESOLVE_COMPUTE; + else if (vk_format_is_int(src_image->vk_format)) *method = RESOLVE_COMPUTE; if (dest_image->surface.num_dcc_levels > 0) {