radv: Do not consider layouts fast-clearable on compute queue.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Thu, 30 Jul 2020 10:21:01 +0000 (12:21 +0200)
committerMarge Bot <eric+marge@anholt.net>
Mon, 10 Aug 2020 16:24:38 +0000 (16:24 +0000)
We cannot decompress from the compute queue. While I'm pretty sure
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL is only useful on the
graphics queue, I cannot find a VU that prevents the transition
from happening on another queue, so we need to be careful here.

This patch ensures we do the decompression on the barrier that changes
the queue ownership.

Another problem was that DCC images were considered fast-clearable
when not DCC compressed, which resulted in a mess with concurrent
queue ownership.

Cc: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3387
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6252>

src/amd/vulkan/radv_image.c

index 8671a6ffb77f882526db63a816c16f07b7aafbf2..7782e77d1fe70e9f3f24e2f4f27eb555412f21eb 100644 (file)
@@ -1712,7 +1712,8 @@ bool radv_layout_can_fast_clear(const struct radv_image *image,
                                bool in_render_loop,
                                unsigned queue_mask)
 {
-       return layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+       return layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL &&
+              queue_mask == (1u << RADV_QUEUE_GENERAL);
 }
 
 bool radv_layout_dcc_compressed(const struct radv_device *device,