preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-17 16:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Comment clarifications. Slightly extend renderlock use in shutdown.

Browse Source
This commit is contained in:
Henrik Rydgård committed 2023-09-25 09:40:14 +02:00
1 parent 8b9836afd3
commit 0fd22ea3bb
2 files changed
+32 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/jni/app-android.cpp
+17 -11
View File
@@ -688,7 +688,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init
EARLY_LOG("NativeApp.init() -- begin");
PROFILE_INIT();
std::lock_guard<std::mutex> guard(renderLock); // Note: This is held for the rest of this function - intended? and even necessary?
std::lock_guard<std::mutex> guard(renderLock);
renderer_inited = false;
exitRenderLoop = false;
androidVersion = jAndroidVersion;
@@ -874,8 +874,13 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_pause(JNIEnv *, jclass) {
extern "C" void Java_org_ppsspp_ppsspp_NativeApp_shutdown(JNIEnv *, jclass) {
INFO_LOG(SYSTEM, "NativeApp.shutdown() -- begin");
if (renderer_inited && useCPUThread && graphicsContext) {
// Only used in Java EGL path.
// We can't lock renderLock here because the emu thread will be in NativeFrame
// which locks renderLock already, and only gets out once we call ThreadFrame()
// in a loop before, to empty the queue.
EmuThreadStop("shutdown");
INFO_LOG(SYSTEM, "BeginAndroidShutdown");
graphicsContext->BeginAndroidShutdown();
@@ -893,18 +898,19 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_shutdown(JNIEnv *, jclass) {
EmuThreadJoin();
}
if (graphicsContext) {
INFO_LOG(G3D, "Shutting down renderer");
graphicsContext->Shutdown();
delete graphicsContext;
graphicsContext = nullptr;
renderer_inited = false;
} else {
INFO_LOG(G3D, "Not shutting down renderer - not initialized");
}
{
std::lock_guard<std::mutex> guard(renderLock);
if (graphicsContext) {
INFO_LOG(G3D, "Shutting down renderer");
graphicsContext->Shutdown();
delete graphicsContext;
graphicsContext = nullptr;
renderer_inited = false;
} else {
INFO_LOG(G3D, "Not shutting down renderer - not initialized");
}
NativeShutdown();
g_VFS.Clear();
}
android/src/org/ppsspp/ppsspp/NativeActivity.java
+15 -10
View File
@@ -751,16 +751,21 @@ public abstract class NativeActivity extends Activity {
super.onDestroy();
Log.i(TAG, "onDestroy");
if (javaGL) {
if (nativeRenderer != null && nativeRenderer.isRenderingFrame()) {
Log.i(TAG, "Waiting for renderer to finish.");
int tries = 200;
do {
try {
Thread.sleep(10);
} catch (InterruptedException e) {
}
tries--;
} while (nativeRenderer.isRenderingFrame() && tries > 0);
if (nativeRenderer != null) {
if (nativeRenderer.isRenderingFrame()) {
Log.i(TAG, "Waiting for renderer to finish.");
int tries = 200;
do {
try {
Thread.sleep(10);
} catch (InterruptedException e) {
}
tries--;
} while (nativeRenderer.isRenderingFrame() && tries > 0);
} else {
Log.i(TAG, "nativerenderer done.");
nativeRenderer = null;
}
}
mGLSurfaceView.onDestroy();
mGLSurfaceView = null;