history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-29 02:05:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix race/crash when switching away/back to the emulation activity

Browse Source
This commit is contained in:
Connor McLaughlin 2020-10-27 11:58:46 +10:00
parent 80a377d45a
commit 7ce55ca800
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/src/cpp/android_host_interface.cpp
View File

@ -447,6 +447,11 @@ void AndroidHostInterface::SurfaceChanged(ANativeWindow* surface, int format, in
wi.surface_height = height; wi.surface_height = height;
m_display->ChangeRenderWindow(wi); m_display->ChangeRenderWindow(wi);
if (surface && System::GetState() == System::State::Paused)
System::SetState(System::State::Running);
else if (!surface && System::IsRunning())
System::SetState(System::State::Paused);
} }
} }
@ -523,7 +528,8 @@ void AndroidHostInterface::SetControllerAxisState(u32 index, s32 button_code, fl
false); false);
} }
void AndroidHostInterface::RefreshGameList(bool invalidate_cache, bool invalidate_database, ProgressCallback* progress_callback) void AndroidHostInterface::RefreshGameList(bool invalidate_cache, bool invalidate_database,
ProgressCallback* progress_callback)
{ {
m_game_list->SetSearchDirectoriesFromSettings(m_settings_interface); m_game_list->SetSearchDirectoriesFromSettings(m_settings_interface);
m_game_list->Refresh(invalidate_cache, invalidate_database, progress_callback); m_game_list->Refresh(invalidate_cache, invalidate_database, progress_callback);

7
android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
View File

@ -29,7 +29,6 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
private SharedPreferences mPreferences; private SharedPreferences mPreferences;
private boolean mWasDestroyed = false; private boolean mWasDestroyed = false;
private boolean mStopRequested = false; private boolean mStopRequested = false;
private boolean mWasPausedOnSurfaceLoss = false;
private boolean mApplySettingsOnSurfaceRestored = false; private boolean mApplySettingsOnSurfaceRestored = false;
private String mGameTitle = null; private String mGameTitle = null;
private EmulationSurfaceView mContentView; private EmulationSurfaceView mContentView;
@ -128,10 +127,6 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
AndroidHostInterface.getInstance().surfaceChanged(holder.getSurface(), format, width, height); AndroidHostInterface.getInstance().surfaceChanged(holder.getSurface(), format, width, height);
updateOrientation(); updateOrientation();
if (holder.getSurface() != null && !hadSurface && AndroidHostInterface.getInstance().isEmulationThreadPaused() && !mWasPausedOnSurfaceLoss) {
AndroidHostInterface.getInstance().pauseEmulationThread(false);
}
if (mApplySettingsOnSurfaceRestored) { if (mApplySettingsOnSurfaceRestored) {
AndroidHostInterface.getInstance().applySettings(); AndroidHostInterface.getInstance().applySettings();
mApplySettingsOnSurfaceRestored = false; mApplySettingsOnSurfaceRestored = false;
@ -159,8 +154,6 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
if (!mStopRequested) if (!mStopRequested)
AndroidHostInterface.getInstance().saveResumeState(true); AndroidHostInterface.getInstance().saveResumeState(true);
mWasPausedOnSurfaceLoss = AndroidHostInterface.getInstance().isEmulationThreadPaused();
AndroidHostInterface.getInstance().pauseEmulationThread(true);
AndroidHostInterface.getInstance().surfaceChanged(null, 0, 0, 0); AndroidHostInterface.getInstance().surfaceChanged(null, 0, 0, 0);
} }

3
src/frontend-common/opengl_host_display.cpp
View File

@ -124,6 +124,9 @@ bool OpenGLHostDisplay::DownloadTexture(const void* texture_handle, u32 x, u32 y
void OpenGLHostDisplay::SetVSync(bool enabled) void OpenGLHostDisplay::SetVSync(bool enabled)
{ {
if (m_gl_context->GetWindowInfo().type == WindowInfo::Type::Surfaceless)
return;
// Window framebuffer has to be bound to call SetSwapInterval. // Window framebuffer has to be bound to call SetSwapInterval.
GLint current_fbo = 0; GLint current_fbo = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_fbo); glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_fbo);

3
src/frontend-common/vulkan_host_display.cpp
View File

@ -234,6 +234,9 @@ bool VulkanHostDisplay::DownloadTexture(const void* texture_handle, u32 x, u32 y
void VulkanHostDisplay::SetVSync(bool enabled) void VulkanHostDisplay::SetVSync(bool enabled)
{ {
if (!m_swap_chain)
return;
// This swap chain should not be used by the current buffer, thus safe to destroy. // This swap chain should not be used by the current buffer, thus safe to destroy.
g_vulkan_context->WaitForGPUIdle(); g_vulkan_context->WaitForGPUIdle();
m_swap_chain->SetVSync(enabled); m_swap_chain->SetVSync(enabled);