eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-29 07:59:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

android: Fix activity pause/resume with external graphics context

Browse source 
This patch fixes two issues with pausing and resuming the Android
activity when an external graphics context[1] is used:

1. When pausing, don't wait for the EGL context to be backed up if a
   context wasn't created in the first place.

2. When resuming, don't recreate the EGL surface unless one was
   requested by the user when originally creating the window.

[1] SDL_PROP_WINDOW_CREATE_EXTERNAL_GRAPHICS_CONTEXT_BOOLEAN
This commit is contained in:
Sami Kyöstilä 2024-07-31 12:28:13 +10:00 • committed by Sam Lantinga
parent 89de8e2110
commit 80f5f0b1fb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/android/SDL_android.c
View file

@ -1226,7 +1226,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(JNIEnv *env, j
SDL_LockMutex(Android_ActivityMutex); SDL_LockMutex(Android_ActivityMutex);
#ifdef SDL_VIDEO_OPENGL_EGL #ifdef SDL_VIDEO_OPENGL_EGL
if (Android_Window) { if (Android_Window && (Android_Window->flags & SDL_WINDOW_OPENGL)) {
SDL_VideoDevice *_this = SDL_GetVideoDevice(); SDL_VideoDevice *_this = SDL_GetVideoDevice();
SDL_WindowData *data = Android_Window->internal; SDL_WindowData *data = Android_Window->internal;
@ -1256,7 +1256,7 @@ retry:
SDL_WindowData *data = Android_Window->internal; SDL_WindowData *data = Android_Window->internal;
/* Wait for Main thread being paused and context un-activated to release 'egl_surface' */ /* Wait for Main thread being paused and context un-activated to release 'egl_surface' */
if (!data->backup_done) { if ((Android_Window->flags & SDL_WINDOW_OPENGL) && !data->backup_done) {
nb_attempt -= 1; nb_attempt -= 1;
if (nb_attempt == 0) { if (nb_attempt == 0) {
SDL_SetError("Try to release egl_surface with context probably still active"); SDL_SetError("Try to release egl_surface with context probably still active");