Mesa (master): radv: Always use fragment resolve if dest uses DCC.

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: a636208ace00e5ba7ddb331362b3e95fd4cea422
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a636208ace00e5ba7ddb331362b3e95fd4cea422

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sat Dec 23 11:43:49 2017 +0100

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 <airlied at redhat.com>

---

 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 e73a950ab7..26489b7834 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -318,11 +318,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;
 	}
 }