Skip to content

Libretro: fix launch hang on devices with Vulkan swapchains that have more than eight images #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattakins wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −9
Open

Libretro: fix launch hang on devices with Vulkan swapchains that have more than eight images #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions Source/Core/DolphinLibretro/Vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,17 @@ static struct
} initInfo;
static bool DEDICATED_ALLOCATION;

#define VULKAN_MAX_SWAPCHAIN_IMAGES 8
struct VkSwapchainImage
{
VkImage handle;
VkDeviceMemory memory;
retro_vulkan_image retro_image;
};

struct VkSwapchainKHR_T
{
uint32_t count;
struct
{
VkImage handle;
VkDeviceMemory memory;
retro_vulkan_image retro_image;
} images[VULKAN_MAX_SWAPCHAIN_IMAGES];
std::vector<VkSwapchainImage> images;
std::mutex mutex;
std::condition_variable condVar;
int current_index;
Expand Down Expand Up @@ -270,7 +271,7 @@ vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInf
chain.count++;
swapchain_mask >>= 1;
}
assert(chain.count <= VULKAN_MAX_SWAPCHAIN_IMAGES);
chain.images.resize(chain.count);

for (uint32_t i = 0; i < chain.count; i++)
{
Expand Down Expand Up @@ -448,7 +449,7 @@ static VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(VkDevice device, VkSwapc
vkFreeMemory(device, chain.images[i].memory, pAllocator);
}

memset(&chain.images, 0x00, sizeof(chain.images));
chain.images.clear();
chain.count = 0;
chain.current_index = -1;
}
Expand Down
Loading