blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vulkan: Fix imported image layout 

(cherry picked from commit 9988eb3378dbc3301059aa9b5e1ff476354cb92b)
This commit is contained in:
nyorain 2021-12-26 13:21:54 +01:00 committed by Simon Ser
parent df945b665c
commit a59a957f2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
render/vulkan/renderer.c
View File

@ -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) { wl_list_for_each_safe(texture, tmp_tex, &renderer->foreign_textures, foreign_link) {
VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL; VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL;
if (!texture->transitioned) { if (!texture->transitioned) {
src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED; src_layout = VK_IMAGE_LAYOUT_UNDEFINED;
texture->transitioned = true; texture->transitioned = true;
} }

2
render/vulkan/texture.c
View File

@ -438,7 +438,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer,
img_info.arrayLayers = 1; img_info.arrayLayers = 1;
img_info.samples = VK_SAMPLE_COUNT_1_BIT; img_info.samples = VK_SAMPLE_COUNT_1_BIT;
img_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; 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.extent = (VkExtent3D) { attribs->width, attribs->height, 1 };
img_info.usage = for_render ? img_info.usage = for_render ?
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT :