mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-12 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move waiting for submit fence to the right place (nvidia crash)

Browse Source
This commit is contained in:
kd-11 2016-03-10 20:45:57 +03:00
parent 26964efa7e
commit 93032be4ab
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -993,17 +993,6 @@ void VKGSRender::flip(int buffer)
aspect_ratio.size = m_frame->client_size(); aspect_ratio.size = m_frame->client_size();
} }
//Check if anything is waiting in queue and submit it if possible..
if (m_submit_fence)
{
CHECK_RESULT(vkWaitForFences((*m_device), 1, &m_submit_fence, VK_TRUE, ~0ULL));
vkDestroyFence((*m_device), m_submit_fence, nullptr);
m_submit_fence = nullptr;
CHECK_RESULT(vkResetCommandBuffer(m_command_buffer, 0));
}
VkSwapchainKHR swap_chain = (VkSwapchainKHR)(*m_swap_chain); VkSwapchainKHR swap_chain = (VkSwapchainKHR)(*m_swap_chain);
uint32_t next_image_temp = 0; uint32_t next_image_temp = 0;
@ -1051,6 +1040,17 @@ void VKGSRender::flip(int buffer)
end_command_buffer_recording(); end_command_buffer_recording();
execute_command_buffer(false); execute_command_buffer(false);
//Check if anything is waiting in queue and wait for it if possible..
if (m_submit_fence)
{
CHECK_RESULT(vkWaitForFences((*m_device), 1, &m_submit_fence, VK_TRUE, ~0ULL));
vkDestroyFence((*m_device), m_submit_fence, nullptr);
m_submit_fence = nullptr;
CHECK_RESULT(vkResetCommandBuffer(m_command_buffer, 0));
}
CHECK_RESULT(m_swap_chain->queuePresentKHR(m_swap_chain->get_present_queue(), &present)); CHECK_RESULT(m_swap_chain->queuePresentKHR(m_swap_chain->get_present_queue(), &present));
CHECK_RESULT(vkQueueWaitIdle(m_swap_chain->get_present_queue())); CHECK_RESULT(vkQueueWaitIdle(m_swap_chain->get_present_queue()));