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

Fix erroneous behaviour in error cases

Browse source 
Corrects error handling when image creation fails and fixes
shutdown behaviour in error cases.

Change-Id: I29b9fbd237b90f6007e4731d9019efb6b4c256ff
Signed-off-by: Iason Paraskevopoulos <iason.paraskevopoulos@arm.com>
This commit is contained in:
Iason Paraskevopoulos 2020-11-26 18:00:05 +00:00
parent 9585b28b12
commit 5b2b2511f7
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wsi/headless/swapchain.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2019 Arm Limited.
* Copyright (c) 2017-2020 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@ -61,7 +61,10 @@ VkResult swapchain::create_image(const VkImageCreateInfo &image_create, wsi::swa
{
VkResult res = VK_SUCCESS;
res = m_device_data.disp.CreateImage(m_device, &image_create, nullptr, &image.image);
assert(VK_SUCCESS == res);
if (res != VK_SUCCESS)
{
return res;
}
VkMemoryRequirements memory_requirements;
m_device_data.disp.GetImageMemoryRequirements(m_device, image.image, &memory_requirements);

8
wsi/swapchain_base.cpp
View file

@ -322,11 +322,17 @@ void swapchain_base::teardown()
}
/* If descendant started presenting, there is no pending buffer in the swapchain. */
if (descendent_started_presenting == false)
if (m_is_valid && descendent_started_presenting == false)
{
wait_for_pending_buffers();
}
if (m_queue != VK_NULL_HANDLE)
{
/* Make sure the vkFences are done signaling. */
vkQueueWaitIdle(m_queue);
}
/* Make sure the vkFences are done signaling. */
m_device_data.disp.QueueWaitIdle(m_queue);