FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 01:45:19 +01:00
Code Issues 2 Projects Releases Wiki Activity

platform/android-nosdl: add Platform_Shutdown for preShutdown callback

Browse Source
This commit is contained in:
mittorn 2023-12-01 16:14:30 +03:00
parent 537202a73d
commit eb8cd4a7c3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/platform/android/android_nosdl.c
View File

@ -265,6 +265,7 @@ DECLARE_JNI_INTERFACE( int, nativeInit, jobject array )
jni.getGLAttribute = (*env)->GetStaticMethodID(env, jni.bindcls, "getGLAttribute", "(I)I");
jni.deleteGLContext = (*env)->GetStaticMethodID(env, jni.bindcls, "deleteGLContext", "()Z");
jni.getSurface = (*env)->GetStaticMethodID(env, jni.bindcls, "getNativeSurface", "(I)Landroid/view/Surface;");
jni.preShutdown = (*env)->GetStaticMethodID(env, jni.bindcls, "preShutdown", "()V");
// jni fails when called from signal handler callback, so jump here when called messagebox from handler
if( setjmp( crash_frame ))
@ -272,8 +273,7 @@ DECLARE_JNI_INTERFACE( int, nativeInit, jobject array )
// note: this will destroy stack and shutting down engine with return-from-main
// will be impossible, but Sys_Quit works
(*jni.env)->CallStaticVoidMethod( jni.env, jni.bindcls, jni.messageBox, (*jni.env)->NewStringUTF( jni.env, "crash" ), (*jni.env)->NewStringUTF( jni.env , crash_text ) );
// java shutdown callback here?
(*jni.env)->CallStaticVoidMethod( jni.env, jni.bindcls, jni.preShutdown );
// UB, but who cares, we already crashed!
longjmp( restore_frame, 1 );
@ -603,7 +603,9 @@ void Android_Init( void )
void Android_Shutdown( void )
{
if( host.crashed )
return;
(*jni.env)->CallStaticVoidMethod( jni.env, jni.bindcls, jni.preShutdown );
}
/*

1
engine/platform/android/android_priv.h
View File

@ -29,6 +29,7 @@ extern struct jnimethods_s
jmethodID getGLAttribute;
jmethodID deleteGLContext;
jmethodID getSurface;
jmethodID preShutdown;
int width, height;
} jni;

2
engine/platform/platform.h
View File

@ -135,6 +135,8 @@ static inline void Platform_Shutdown( void )
#if XASH_SDL
SDLash_Shutdown( );
#elif XASH_ANDROID
Android_Shutdown();
#endif
}