From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Oct 2016 02:05:44 +0000 (+1000)
Subject: radv: allow cmask transitions without fast clear
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a969548f59342330badf78ec7721a1ead7599a29;p=mesa.git

radv: allow cmask transitions without fast clear

This fixes
dEQP-VK.pipeline.multisample.sampled_image*

These all render to multisampled image, and then
sample from it, so we must transition it correctly,
since we have a cmask and fmask this will cause
the correct transition.

Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 3f1a6f42527..690c739c2ab 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2163,9 +2163,6 @@ static void radv_handle_cmask_image_transition(struct radv_cmd_buffer *cmd_buffe
 			radv_initialise_cmask(cmd_buffer, image, 0xffffffffu);
 	} else if (radv_layout_has_cmask(image, src_layout) &&
 		   !radv_layout_has_cmask(image, dst_layout)) {
-
-		if (!cmd_buffer->device->allow_fast_clears)
-			return;
 		radv_fast_clear_flush_image_inplace(cmd_buffer, image);
 	}
 }