VideoCommon: Hold ImGui lock while initializing and shutting down ImGui.
This commit is contained in:
parent
e37aa3ed90
commit
a98df18947
|
@ -1009,6 +1009,8 @@ void Renderer::RecordVideoMemory()
|
||||||
|
|
||||||
bool Renderer::InitializeImGui()
|
bool Renderer::InitializeImGui()
|
||||||
{
|
{
|
||||||
|
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
|
||||||
|
|
||||||
if (!IMGUI_CHECKVERSION())
|
if (!IMGUI_CHECKVERSION())
|
||||||
{
|
{
|
||||||
PanicAlertFmt("ImGui version check failed");
|
PanicAlertFmt("ImGui version check failed");
|
||||||
|
@ -1068,7 +1070,7 @@ bool Renderer::InitializeImGui()
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
m_imgui_last_frame_time = Common::Timer::NowUs();
|
m_imgui_last_frame_time = Common::Timer::NowUs();
|
||||||
BeginImGuiFrame();
|
BeginImGuiFrameUnlocked(); // lock is already held
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1129,6 +1131,8 @@ bool Renderer::RecompileImGuiPipeline()
|
||||||
|
|
||||||
void Renderer::ShutdownImGui()
|
void Renderer::ShutdownImGui()
|
||||||
{
|
{
|
||||||
|
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
|
||||||
|
|
||||||
ImGui::EndFrame();
|
ImGui::EndFrame();
|
||||||
ImGui::DestroyContext();
|
ImGui::DestroyContext();
|
||||||
m_imgui_pipeline.reset();
|
m_imgui_pipeline.reset();
|
||||||
|
@ -1139,7 +1143,11 @@ void Renderer::ShutdownImGui()
|
||||||
void Renderer::BeginImGuiFrame()
|
void Renderer::BeginImGuiFrame()
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
|
std::unique_lock<std::mutex> imgui_lock(m_imgui_mutex);
|
||||||
|
BeginImGuiFrameUnlocked();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Renderer::BeginImGuiFrameUnlocked()
|
||||||
|
{
|
||||||
const u64 current_time_us = Common::Timer::NowUs();
|
const u64 current_time_us = Common::Timer::NowUs();
|
||||||
const u64 time_diff_us = current_time_us - m_imgui_last_frame_time;
|
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);
|
const float time_diff_secs = static_cast<float>(time_diff_us / 1000000.0);
|
||||||
|
|
|
@ -303,6 +303,9 @@ protected:
|
||||||
// This function itself acquires the ImGui lock, so it should not be held.
|
// This function itself acquires the ImGui lock, so it should not be held.
|
||||||
void BeginImGuiFrame();
|
void BeginImGuiFrame();
|
||||||
|
|
||||||
|
// Same as above but without locking the ImGui lock.
|
||||||
|
void BeginImGuiFrameUnlocked();
|
||||||
|
|
||||||
// Destroys all ImGui GPU resources, must do before shutdown.
|
// Destroys all ImGui GPU resources, must do before shutdown.
|
||||||
void ShutdownImGui();
|
void ShutdownImGui();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue