From 36ce47635bd6b7287252fd87847629c853dabb6f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 10 Oct 2018 21:41:52 +1000 Subject: RenderWidget: Hook up to ImGui --- Source/Core/VideoCommon/RenderBase.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 76f3d29864..dd988b3f5c 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -812,9 +812,18 @@ void Renderer::DrawImGui() } } +std::unique_lock Renderer::GetImGuiLock() +{ + return std::unique_lock(m_imgui_mutex); +} + void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, u64 ticks) { + // Hold the imgui lock while we're presenting. + // It's only to prevent races on inputs anyway, at this point. + std::unique_lock imgui_lock(m_imgui_mutex); + const AspectMode suggested = g_ActiveConfig.suggested_aspect_mode; if (suggested == AspectMode::Analog || suggested == AspectMode::AnalogWide) { -- cgit v1.2.3