archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rsx: Make overlay manager default lock-state exclusive

Browse source
This commit is contained in:
kd-11 2024-03-28 01:16:07 +03:00 • committed by Megamouse
parent 236ac7d062
commit 175aa510c8
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/GL/GLPresent.cpp
View file

@ -350,7 +350,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
{ {
if (m_overlay_manager->has_dirty()) if (m_overlay_manager->has_dirty())
{ {
m_overlay_manager->lock(); m_overlay_manager->lock_shared();
std::vector<u32> uids_to_dispose; std::vector<u32> uids_to_dispose;
uids_to_dispose.reserve(m_overlay_manager->get_dirty().size()); uids_to_dispose.reserve(m_overlay_manager->get_dirty().size());
@ -361,7 +361,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
uids_to_dispose.push_back(view->uid); uids_to_dispose.push_back(view->uid);
} }
m_overlay_manager->unlock(); m_overlay_manager->unlock_shared();
m_overlay_manager->dispose(uids_to_dispose); m_overlay_manager->dispose(uids_to_dispose);
} }

17
rpcs3/Emu/RSX/Overlays/overlay_manager.cpp
View file

@ -45,18 +45,27 @@ namespace rsx
void display_manager::lock() void display_manager::lock()
{ {
m_list_mutex.lock_shared(); m_list_mutex.lock();
} }
void display_manager::unlock() void display_manager::unlock()
{ {
m_list_mutex.unlock_shared();
if (m_pending_removals_count > 0) if (m_pending_removals_count > 0)
{ {
std::lock_guard lock(m_list_mutex);
cleanup_internal(); cleanup_internal();
} }
m_list_mutex.unlock();
}
void display_manager::lock_shared()
{
m_list_mutex.lock_shared();
}
void display_manager::unlock_shared()
{
m_list_mutex.unlock_shared();
} }
std::shared_ptr<overlay> display_manager::get(u32 uid) std::shared_ptr<overlay> display_manager::get(u32 uid)

10
rpcs3/Emu/RSX/Overlays/overlay_manager.h
View file

@ -150,12 +150,18 @@ namespace rsx
return {}; return {};
} }
// Lock for read-only access (BasicLockable) // Lock for exclusive access (BasicLockable)
void lock(); void lock();
// Release read-only lock (BasicLockable). May perform internal cleanup before returning // Release lock (BasicLockable). May perform internal cleanup before returning
void unlock(); void unlock();
// Lock for shared access (reader-lock)
void lock_shared();
// Unlock for shared access (reader-lock)
void unlock_shared();
// Enable input thread attach to the specified interface // Enable input thread attach to the specified interface
void attach_thread_input( void attach_thread_input(
u32 uid, // The input target u32 uid, // The input target

4
rpcs3/Emu/RSX/VK/VKPresent.cpp
View file

@ -220,7 +220,7 @@ void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx)
if (m_overlay_manager && m_overlay_manager->has_dirty()) if (m_overlay_manager && m_overlay_manager->has_dirty())
{ {
auto ui_renderer = vk::get_overlay_pass<vk::ui_overlay_renderer>(); auto ui_renderer = vk::get_overlay_pass<vk::ui_overlay_renderer>();
m_overlay_manager->lock(); m_overlay_manager->lock_shared();
std::vector<u32> uids_to_dispose; std::vector<u32> uids_to_dispose;
uids_to_dispose.reserve(m_overlay_manager->get_dirty().size()); uids_to_dispose.reserve(m_overlay_manager->get_dirty().size());
@ -231,7 +231,7 @@ void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx)
uids_to_dispose.push_back(view->uid); uids_to_dispose.push_back(view->uid);
} }
m_overlay_manager->unlock(); m_overlay_manager->unlock_shared();
m_overlay_manager->dispose(uids_to_dispose); m_overlay_manager->dispose(uids_to_dispose);
} }