From e1332ee978f70cc080478f72bd6f96f5286bc42d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 24 Apr 2024 10:00:57 +0200 Subject: [PATCH] radv: fix image format properties with fragment shading rate usage This was missing and this caused test failures for formats different than VK_FORMAT_R8_UINT which is the only one supported for FSR. Fixes recent dEQP-VK.api.info.unsupported_image_usage.*.fragment_shading_rate_attachment.*. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit e8d94536d21a6f2087b21eecc9f15dcac0a362e8) --- .pick_status.json | 2 +- src/amd/vulkan/radv_formats.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 8e49c541b7f..8bc94ebed8f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2534,7 +2534,7 @@ "description": "radv: fix image format properties with fragment shading rate usage", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 7ed01f2aae0..4c80501d8d3 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -1480,6 +1480,11 @@ radv_get_image_format_properties(struct radv_physical_device *physical_device, } } + if (image_usage & VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) { + if (!(format_feature_flags & VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR)) + goto unsupported; + } + /* Sparse resources with multi-planar formats are unsupported. */ if (info->flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT) { if (vk_format_get_plane_count(format) > 1)