mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 12:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: Properly clean up async scheduler

Browse Source
This commit is contained in:
kd-11 2021-02-28 22:18:14 +03:00 committed by kd-11
parent 41f5158247
commit c9e8b87c60
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp
View File

@ -67,18 +67,11 @@ namespace vk
AsyncTaskScheduler::~AsyncTaskScheduler()
{
*g_fxo->get<async_scheduler_thread>() = thread_state::aborting;
while (has_refs()) _mm_pause();
for (auto& cb : m_async_command_queue)
if (!m_async_command_queue.empty())
{
cb.destroy();
// Driver resources should be destroyed before driver is detached or you get crashes. RAII won't save you here.
rsx_log.error("Async task scheduler resources were not freed correctly!");
}
m_async_command_queue.clear();
m_next_cb_index = 0;
m_command_pool.destroy();
m_events_pool.clear();
}
command_buffer* AsyncTaskScheduler::get_current()
@ -158,4 +151,20 @@ namespace vk
m_current_cb = nullptr;
m_sync_required = false;
}
void AsyncTaskScheduler::kill()
{
*g_fxo->get<async_scheduler_thread>() = thread_state::aborting;
while (has_refs()) _mm_pause();
for (auto& cb : m_async_command_queue)
{
cb.destroy();
}
m_async_command_queue.clear();
m_next_cb_index = 0;
m_command_pool.destroy();
m_events_pool.clear();
}
}

1
rpcs3/Emu/RSX/VK/VKAsyncScheduler.h
View File

@ -49,6 +49,7 @@ namespace vk
event* get_primary_sync_label();
void flush(VkSemaphore wait_semaphore = VK_NULL_HANDLE, VkPipelineStageFlags wait_dst_stage_mask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
void kill();
// Thread entry-point
void operator()();

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

@ -558,6 +558,9 @@ VKGSRender::~VKGSRender()
return;
}
// Globals. TODO: Refactor lifetime management
g_fxo->get<vk::async_scheduler_thread>()->kill();
//Wait for device to finish up with resources
vkDeviceWaitIdle(*m_device);