radv: allow cmask transitions without fast clear
authorDave Airlie <airlied@redhat.com>
Thu, 20 Oct 2016 02:05:44 +0000 (12:05 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 24 Oct 2016 01:03:09 +0000 (11:03 +1000)
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>
src/amd/vulkan/radv_cmd_buffer.c

index 3f1a6f42527ac5c5f2ad0ff13f6030015cb5030c..690c739c2aba8c4a3bf0806f64249891d6c34945 100644 (file)
@@ -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);
        }
 }