From 2236dd6d5513d61ac25e6a40bd02b4d874efa666 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 26 Apr 2023 09:52:56 -0400 Subject: [PATCH] zink: reapply VkImageViewUsageCreateInfo when rebinding a surface attachment bits must always be removed if they are not supported fixes (ANV): KHR-GL46.texture_view.view_classes cc: mesa-stable Part-of: (cherry picked from commit 13eaa7cdd0c518d0d3feb9f9e971919dcf292691) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_surface.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 83790b3b0de..313c07516fe 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1696,7 +1696,7 @@ "description": "zink: reapply VkImageViewUsageCreateInfo when rebinding a surface", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_surface.c b/src/gallium/drivers/zink/zink_surface.c index c36df1f12a6..c25acf47d73 100644 --- a/src/gallium/drivers/zink/zink_surface.c +++ b/src/gallium/drivers/zink/zink_surface.c @@ -421,6 +421,7 @@ zink_rebind_surface(struct zink_context *ctx, struct pipe_surface **psurface) assert(entry); _mesa_hash_table_remove(&res->surface_cache, entry); VkImageView image_view; + apply_view_usage_for_format(screen, res, surface, surface->base.format, &ivci); VkResult result = VKSCR(CreateImageView)(screen->dev, &ivci, NULL, &image_view); if (result != VK_SUCCESS) { mesa_loge("ZINK: failed to create new imageview (%s)", vk_Result_to_str(result));