diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp index 69e8b4509f..dafbd3f193 100644 --- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp +++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp @@ -152,7 +152,7 @@ namespace vk void AsyncTaskScheduler::kill() { - *g_fxo->get() = thread_state::aborting; + g_fxo->get() = thread_state::aborting; while (has_refs()) _mm_pause(); for (auto& cb : m_async_command_queue) diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp index a2371c36d1..97108fe572 100644 --- a/rpcs3/Emu/RSX/VK/VKDraw.cpp +++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp @@ -963,7 +963,7 @@ void VKGSRender::end() m_frame_stats.setup_time += m_profiler.duration(); // Sync any async scheduler tasks - if (auto ev = g_fxo->get()->get_primary_sync_label()) + if (auto ev = g_fxo->get().get_primary_sync_label()) { ev->gpu_wait(*m_current_command_buffer); } diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 06ac388f8a..27e2c440c6 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -559,7 +559,7 @@ VKGSRender::~VKGSRender() } // Globals. TODO: Refactor lifetime management - g_fxo->get()->kill(); + g_fxo->get().kill(); //Wait for device to finish up with resources vkDeviceWaitIdle(*m_device); @@ -1939,7 +1939,7 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore const VkBool32 force_flush = !sync_success; // Flush any asynchronously scheduled jobs - g_fxo->get()->flush(force_flush); + g_fxo->get().flush(force_flush); if (vk::test_status_interrupt(vk::heap_dirty)) { diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index 18ff71ea03..e33f18fa52 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -803,7 +803,7 @@ namespace vk const vk::command_buffer* pcmd = nullptr; if (flags & image_upload_options::upload_contents_async) { - auto async_cmd = g_fxo->get()->get_current(); + auto async_cmd = g_fxo->get().get_current(); async_cmd->begin(); pcmd = async_cmd;