radv: add a sanity check for mutable formats and TC-compat HTILE

If apps use the MUTABLE bit and the same formats as the image one
in the list, we can still enable TC-compat HTILE. I don't think
this happens often but given the fact that TC-compat HTILE allows
a nice boost in some situations, it's worth checking.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 65a62fb991ae149ea4b3ebfff0eb1c9e8e7b03d0..64346aa340fe8cd508a068d2e685bfb614469da1 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -72,11 +72,8 @@ radv_use_tc_compat_htile_for_image(struct radv_device *device,
        if (device->physical_device->rad_info.chip_class < VI)
                return false;
 
-       if (pCreateInfo->usage & VK_IMAGE_USAGE_STORAGE_BIT)
-               return false;
-
-       if (pCreateInfo->flags & (VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT |
-                                 VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR))
+       if ((pCreateInfo->usage & VK_IMAGE_USAGE_STORAGE_BIT) ||
+           (pCreateInfo->flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR))
                return false;
 
        if (pCreateInfo->tiling == VK_IMAGE_TILING_LINEAR)
@@ -100,6 +97,26 @@ radv_use_tc_compat_htile_for_image(struct radv_device *device,
            pCreateInfo->format != VK_FORMAT_D16_UNORM)
                return false;
 
+       if (pCreateInfo->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) {
+               const struct VkImageFormatListCreateInfoKHR *format_list =
+                       (const struct  VkImageFormatListCreateInfoKHR *)
+                               vk_find_struct_const(pCreateInfo->pNext,
+                                                    IMAGE_FORMAT_LIST_CREATE_INFO_KHR);
+
+               /* We have to ignore the existence of the list if viewFormatCount = 0 */
+               if (format_list && format_list->viewFormatCount) {
+                       /* compatibility is transitive, so we only need to check
+                        * one format with everything else.
+                        */
+                       for (unsigned i = 0; i < format_list->viewFormatCount; ++i) {
+                               if (pCreateInfo->format != format_list->pViewFormats[i])
+                                       return false;
+                       }
+               } else {
+                       return false;
+               }
+       }
+
        return true;
 }