From 1ac05d0409ce2d9c8727138029c45be91c81a77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Wed, 24 Apr 2024 14:48:10 -0700 Subject: [PATCH] anv: check requirements for VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE Somehow I missed this one in 164c0951a0825527244e999a261b8a4425ed1ebe If the format the image is being created with doesn't have the FSR format feature, report it as unsupported. Also fixes future CTS tests: dEQP-VK.api.info.unsupported_image_usage.* Cc: mesa-stable Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 8ebf07eccd1f7476033e0151b9eb19a51d871c51) --- .pick_status.json | 2 +- src/intel/vulkan/anv_formats.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 74f63f4b0bb..9b1e97ebb3a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1804,7 +1804,7 @@ "description": "anv: check requirements for VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 5cc97ec8aa0..65c000398b7 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -1077,6 +1077,12 @@ anv_format_supports_usage( */ } + if (usage_flags & VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) { + if (!(format_feature_flags & VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR)) { + return false; + } + } + return true; }