Mesa (13.0): radv: allow cmask transitions without fast clear

[Emil Velikov]

Module: Mesa
Branch: 13.0
Commit: 0f8b7f90d1e52343e04128bc55948c141a71d0ca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f8b7f90d1e52343e04128bc55948c141a71d0ca

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Oct 20 12:05:44 2016 +1000

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 at lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit a969548f59342330badf78ec7721a1ead7599a29)

---

 src/amd/vulkan/radv_cmd_buffer.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 3f1a6f4..690c739 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);
 	}
 }