fdo-mirrors/vulkan-wsi-layer
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git synced 2025-12-20 05:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 'Fix a case where OOM condition was not checked' into 'main'

Browse source 
See merge request mesa/vulkan-wsi-layer!218
This commit is contained in:
Iason Paraskevopoulos 2025-12-02 14:36:52 +00:00
commit 0866cfc352
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wsi/display/swapchain.cpp
View file

@ -202,6 +202,10 @@ VkResult swapchain::init_image_factory(const VkSwapchainCreateInfoKHR &swapchain
auto backing_memory_creator = auto backing_memory_creator =
m_allocator.make_unique<external_image_backing_memory_creator>(m_device_data, *m_wsi_allocator, wsialloc_args); m_allocator.make_unique<external_image_backing_memory_creator>(m_device_data, *m_wsi_allocator, wsialloc_args);
if (backing_memory_creator == nullptr)
{
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), true, true); m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), true, true);
return VK_SUCCESS; return VK_SUCCESS;

4
wsi/headless/swapchain.cpp
View file

@ -156,6 +156,10 @@ VkResult swapchain::init_image_factory(const VkSwapchainCreateInfoKHR &swapchain
auto image_handle_creator = auto image_handle_creator =
std::get<util::unique_ptr<vulkan_image_handle_creator>>(std::move(image_handle_creator_result)); std::get<util::unique_ptr<vulkan_image_handle_creator>>(std::move(image_handle_creator_result));
auto backing_memory_creator = m_allocator.make_unique<device_backing_memory_creator>(m_device_data); auto backing_memory_creator = m_allocator.make_unique<device_backing_memory_creator>(m_device_data);
if (backing_memory_creator == nullptr)
{
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), false, true); m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), false, true);
return VK_SUCCESS; return VK_SUCCESS;

4
wsi/wayland/swapchain.cpp
View file

@ -272,6 +272,10 @@ VkResult swapchain::init_image_factory(const VkSwapchainCreateInfoKHR &swapchain
auto backing_memory_creator = auto backing_memory_creator =
m_allocator.make_unique<external_image_backing_memory_creator>(m_device_data, *m_wsi_allocator, wsialloc_args); m_allocator.make_unique<external_image_backing_memory_creator>(m_device_data, *m_wsi_allocator, wsialloc_args);
if (backing_memory_creator == nullptr)
{
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), true, false); m_image_factory.init(std::move(image_handle_creator), std::move(backing_memory_creator), true, false);
return VK_SUCCESS; return VK_SUCCESS;