franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6180 from Joshua-Ashton/device_loss_fix 

renderer_vulkan: Check return value of AcquireNextImage
This commit is contained in:
Morph 2021-04-11 05:08:32 -04:00 committed by GitHub
parent 4f60818eae bcf58c8210
commit 9bd71f4064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_vulkan/renderer_vulkan.cpp
View File

@ -143,7 +143,10 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
scheduler.WaitWorker(); scheduler.WaitWorker();
swapchain.AcquireNextImage(); while (!swapchain.AcquireNextImage()) {
swapchain.Create(layout.width, layout.height, is_srgb);
blit_screen.Recreate();
}
const VkSemaphore render_semaphore = blit_screen.Draw(*framebuffer, use_accelerated); const VkSemaphore render_semaphore = blit_screen.Draw(*framebuffer, use_accelerated);
scheduler.Flush(render_semaphore); scheduler.Flush(render_semaphore);

8
src/video_core/renderer_vulkan/vk_swapchain.cpp
View File

@ -82,11 +82,13 @@ void VKSwapchain::Create(u32 width, u32 height, bool srgb) {
resource_ticks.resize(image_count); resource_ticks.resize(image_count);
} }
void VKSwapchain::AcquireNextImage() { bool VKSwapchain::AcquireNextImage() {
device.GetLogical().AcquireNextImageKHR(*swapchain, std::numeric_limits<u64>::max(), const VkResult result =
*present_semaphores[frame_index], {}, &image_index); device.GetLogical().AcquireNextImageKHR(*swapchain, std::numeric_limits<u64>::max(),
*present_semaphores[frame_index], {}, &image_index);
scheduler.Wait(resource_ticks[image_index]); scheduler.Wait(resource_ticks[image_index]);
return result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR;
} }
bool VKSwapchain::Present(VkSemaphore render_semaphore) { bool VKSwapchain::Present(VkSemaphore render_semaphore) {

2
src/video_core/renderer_vulkan/vk_swapchain.h
View File

@ -28,7 +28,7 @@ public:
void Create(u32 width, u32 height, bool srgb); void Create(u32 width, u32 height, bool srgb);
/// Acquires the next image in the swapchain, waits as needed. /// Acquires the next image in the swapchain, waits as needed.
void AcquireNextImage(); bool AcquireNextImage();
/// Presents the rendered image to the swapchain. Returns true when the swapchains had to be /// Presents the rendered image to the swapchain. Returns true when the swapchains had to be
/// recreated. Takes responsability for the ownership of fence. /// recreated. Takes responsability for the ownership of fence.