From fee952305cf8ebd55f0cd475afb3d921398d375a Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 8 Aug 2024 22:05:34 -0500 Subject: [PATCH] nvk: Require color or depth/stencil attachment support for input attachments Fixes: 20d8d1e239be ("nvk: Add a more competent GetPhysicalDeviceImageFormatProperties") Part-of: (cherry picked from commit 08f6066e87a461444f347bef56e5e56225e5c2c3) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_image.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 944251bc28d..a3be45ae023 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2054,7 +2054,7 @@ "description": "nvk: Require color or depth/stencil attachment support for input attachments", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "20d8d1e239be95143fc25886fe28aeb5d82a4d8c", "notes": null diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 6f8752c5f56..d4567b05d71 100755 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -266,6 +266,9 @@ vk_image_usage_to_format_features(VkImageUsageFlagBits usage_flag) return VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT; case VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT: return VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT; + case VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT: + return VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | + VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT; default: return 0; }