From 7385e9129c8f8b57d4b7e5423c414f9713eff3c9 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 6 Aug 2020 21:57:12 +0200 Subject: Remove wait_for_completion parameter from Renderer::SaveScreenshot This is now unused. Seems like it was an improper fix (there would be a race if saving the screenshot took longer than 2 seconds) back when it was used too. --- Source/Core/VideoCommon/RenderBase.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 2e5709f86c..a60f9b9f91 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -378,20 +378,11 @@ Renderer::ConvertStereoRectangle(const MathUtil::Rectangle& rc) const return std::make_tuple(left_rc, right_rc); } -void Renderer::SaveScreenshot(std::string filename, bool wait_for_completion) +void Renderer::SaveScreenshot(std::string filename) { - // We must not hold the lock while waiting for the screenshot to complete. - { - std::lock_guard lk(m_screenshot_lock); - m_screenshot_name = std::move(filename); - m_screenshot_request.Set(); - } - - if (wait_for_completion) - { - // This is currently only used by Android, and it was using a wait time of 2 seconds. - m_screenshot_completed.WaitFor(std::chrono::seconds(2)); - } + std::lock_guard lk(m_screenshot_lock); + m_screenshot_name = std::move(filename); + m_screenshot_request.Set(); } void Renderer::CheckForConfigChanges() -- cgit v1.2.3