Emulator-Archive/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2024-11-27 08:00:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Android: Block for window changes/surface destruction

Browse Source
This commit is contained in:
Connor McLaughlin 2021-01-27 01:01:07 +10:00
parent 368820d6e9
commit 0b4363679c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,10 +1001,12 @@ DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_surfaceChanged, jobject obj, j
if (surface && !native_surface)
Log_ErrorPrint("ANativeWindow_fromSurface() returned null");
// We should wait for the emu to finish if the surface is being destroyed or changed.
AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj);
const bool block = (!native_surface || native_surface != hi->GetSurface());
hi->RunOnEmulationThread(
[hi, native_surface, format, width, height]() { hi->SurfaceChanged(native_surface, format, width, height); },
false);
block);
}
DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_setControllerType, jobject obj, jint index, jstring controller_type)

2
android/app/src/cpp/android_host_interface.h
View File

@ -24,6 +24,8 @@ public:
AndroidHostInterface(jobject java_object, jobject context_object, std::string user_directory);
~AndroidHostInterface() override;
ALWAYS_INLINE ANativeWindow* GetSurface() const { return m_surface; }
bool Initialize() override;
void Shutdown() override;