From 98427a3dd54ff83afb3ac36790fbe006bcf892db Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 24 Jul 2023 16:29:08 -0400 Subject: [PATCH] zink: don't add VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT for transient images this is illegal cc: mesa-stable Part-of: (cherry picked from commit 751407a59ab9e91d2a94fa32a7de3228c1733f4d) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5e42d084fc1..3cd4a2a062d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9424,7 +9424,7 @@ "description": "zink: don't add VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT for transient images", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 888bee50774..afc1a1f2f3a 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -419,7 +419,7 @@ get_image_usage_for_feats(struct zink_screen *screen, VkFormatFeatureFlags feats usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; else return 0; - if (screen->info.have_EXT_attachment_feedback_loop_layout) + if (screen->info.have_EXT_attachment_feedback_loop_layout && !(bind & ZINK_BIND_TRANSIENT)) usage |= VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT; /* this is unlikely to occur and has been included for completeness */ } else if (bind & PIPE_BIND_SAMPLER_VIEW && !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) {