From 459a5ab554af24c8e2c1978d02444bac5aa85e3f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 4 Mar 2017 16:42:35 +1000 Subject: Android: Move screenshot waiting logic to Renderer --- Source/Core/VideoCommon/RenderBase.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.h') diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index a8323c27a2..79c174e28c 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -111,7 +111,7 @@ public: float EFBToScaledXf(float x) { return x * ((float)GetTargetWidth() / (float)EFB_WIDTH); } float EFBToScaledYf(float y) { return y * ((float)GetTargetHeight() / (float)EFB_HEIGHT); } // Random utilities - void SetScreenshot(const std::string& filename); + void SaveScreenshot(const std::string& filename, bool wait_for_completion); void DrawDebugText(); virtual void RenderText(const std::string& text, int left, int top, u32 color) = 0; @@ -140,8 +140,6 @@ public: // Max height/width virtual u32 GetMaxTextureSize() = 0; - Common::Event s_screenshot_completed; - // Final surface changing // This is called when the surface is resized (WX) or the window changes (Android). virtual void ChangeSurface(void* new_surface_handle) {} @@ -158,6 +156,7 @@ protected: void FinishFrameData(); Common::Flag m_screenshot_request; + Common::Event m_screenshot_completed; std::mutex m_screenshot_lock; std::string m_screenshot_name; -- cgit v1.2.3