piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11258 from AdmiralCurtiss/imgui-crash-v2

Browse Source 
ImGui render context race condition fix: Lock context during Init/Shutdown.
This commit is contained in:
Admiral H. Curtiss 2022-11-07 05:05:37 +01:00 committed by GitHub
commit ee7887b751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/RenderWidget.cpp
View File

@ -554,6 +554,9 @@ void RenderWidget::SetImGuiKeyMap()
}};
auto lock = g_renderer->GetImGuiLock();
if (!ImGui::GetCurrentContext())
return;
for (auto [imgui_key, qt_key] : key_map)
ImGui::GetIO().KeyMap[imgui_key] = (qt_key & 0x1FF);
}

10
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -1009,6 +1009,8 @@ void Renderer::RecordVideoMemory()
bool Renderer::InitializeImGui()
{
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
if (!IMGUI_CHECKVERSION())
{
PanicAlertFmt("ImGui version check failed");
@ -1068,7 +1070,7 @@ bool Renderer::InitializeImGui()
return false;
m_imgui_last_frame_time = Common::Timer::NowUs();
BeginImGuiFrame();
BeginImGuiFrameUnlocked(); // lock is already held
return true;
}
@ -1129,6 +1131,8 @@ bool Renderer::RecompileImGuiPipeline()
void Renderer::ShutdownImGui()
{
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
ImGui::EndFrame();
ImGui::DestroyContext();
m_imgui_pipeline.reset();
@ -1139,7 +1143,11 @@ void Renderer::ShutdownImGui()
void Renderer::BeginImGuiFrame()
{
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
BeginImGuiFrameUnlocked();
}
void Renderer::BeginImGuiFrameUnlocked()
{
const u64 current_time_us = Common::Timer::NowUs();
const u64 time_diff_us = current_time_us - m_imgui_last_frame_time;
const float time_diff_secs = static_cast<float>(time_diff_us / 1000000.0);

3
Source/Core/VideoCommon/RenderBase.h
View File

@ -303,6 +303,9 @@ protected:
// This function itself acquires the ImGui lock, so it should not be held.
void BeginImGuiFrame();
// Same as above but without locking the ImGui lock.
void BeginImGuiFrameUnlocked();
// Destroys all ImGui GPU resources, must do before shutdown.
void ShutdownImGui();