From a59a957f2b1d3c759f0eafdd8e970e667b0ca9c7 Mon Sep 17 00:00:00 2001 From: nyorain Date: Sun, 26 Dec 2021 13:21:54 +0100 Subject: [PATCH] vulkan: Fix imported image layout (cherry picked from commit 9988eb3378dbc3301059aa9b5e1ff476354cb92b) --- render/vulkan/renderer.c | 2 +- render/vulkan/texture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index a1d8d41e..21b36bdd 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -598,7 +598,7 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) { wl_list_for_each_safe(texture, tmp_tex, &renderer->foreign_textures, foreign_link) { VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL; if (!texture->transitioned) { - src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED; + src_layout = VK_IMAGE_LAYOUT_UNDEFINED; texture->transitioned = true; } diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index 76c37011..b705603c 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -438,7 +438,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer, img_info.arrayLayers = 1; img_info.samples = VK_SAMPLE_COUNT_1_BIT; img_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - img_info.initialLayout = VK_IMAGE_LAYOUT_PREINITIALIZED; + img_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; img_info.extent = (VkExtent3D) { attribs->width, attribs->height, 1 }; img_info.usage = for_render ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT :