From ad3cd581f415d63a607d9fe99601e00b91035aa5 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 14 Oct 2021 11:10:09 +0200 Subject: [PATCH] radv: add support for VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 87640d10b1e..554249dc54e 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -2100,6 +2100,7 @@ radv_layout_is_htile_compressed(const struct radv_device *device, const struct r case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL: case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL: + case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR: return radv_image_has_htile(image); case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: return radv_image_is_tc_compat_htile(image) || @@ -2151,7 +2152,8 @@ radv_layout_can_fast_clear(const struct radv_device *device, const struct radv_i if (!(image->usage & RADV_IMAGE_USAGE_WRITE_BITS)) return false; - if (layout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) + if (layout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL && + layout != VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR) return false; /* Exclusive images with CMASK or DCC can always be fast-cleared on the gfx queue. Concurrent