mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-07-30 10:16:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from AngelAuraMC/fix/sdl-issues

Browse Source 
sdl bugfixes
This commit is contained in:
tomikun
2026-07-28 15:06:14 +08:00
committed by GitHub
parent e2bc2f92bb 417500e184
commit 16451de9d3
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app_pojavlauncher/src/main/jni/native_hooks/sdl_hook.c
View File

@@ -19,7 +19,7 @@ DECL_DLSYM(SDL_SetError);
static bool custom_SDL_InitSubSystem_Func(SDL_InitFlags flags) {
// Call notifyLauncher on SDL_InitSubSystem, this sets up all the JNI stuff needed by SDL.
TRY_ATTACH_ENV(dvm_env, pojav_environ->dalvikJavaVMPtr, "SDL_InitSubSystem failed!",
SET_DLSYM_PTR(SDL_SetError);
SET_DLSYM_PTR(dlopen("libSDL3.so", RTLD_NOLOAD), SDL_SetError);
if (SDL_SetError_p) SDL_SetError_p("Failed to load SDL launcher integration android-side. This is not an SDL bug, please contact the launcher developer.");
return false;
);
@@ -33,10 +33,13 @@ static bool custom_SDL_InitSubSystem_Func(SDL_InitFlags flags) {
notifyLauncher(dvm_env, NOTIF_TYPE_SDL, (int[]){ACTION_INIT_LAUNCHER_INTEGRATION, safeFlags}, 2);
// This is the normal for the launcher, the default in SDL is false.
SET_DLSYM_PTR(SDL_SetHint);
SET_DLSYM_PTR(dlopen("libSDL3.so", RTLD_NOLOAD), SDL_SetHint);
if (SDL_SetHint_p) SDL_SetHint_p("SDL_RETURN_KEY_HIDES_IME", "true");
// FIXME: idk why it wont srgb, sorry
SDL_SetHint_p("SDL_OPENGL_FORCE_SRGB_FRAMEBUFFER", "0");
// FIXME: MobileGlues has issues with passing in the proper EGL params to make this work
const char *egl = getenv("POJAVEXEC_EGL");
if (egl && strcmp(egl, "libmobileglues.so") == 0) {
SDL_SetHint_p("SDL_OPENGL_FORCE_SRGB_FRAMEBUFFER", "0");
}
// Call original func after doing all the needed setup
bool r = BYTEHOOK_CALL_PREV(custom_SDL_InitSubSystem_Func, SDL_InitSubSystem_t, flags);
@@ -58,6 +61,7 @@ static bool custom_SDL_InitSubSystem_Func(SDL_InitFlags flags) {
void create_sdl_hooks(bytehook_hook_all_t bytehook_hook_all_p) {
bytehook_stub_t stub_SDL_InitSubSystem = bytehook_hook_all_p("libSDL3.so", "SDL_InitSubSystem", &custom_SDL_InitSubSystem_Func, NULL, NULL);
// Don't set callee_path_name to anything besides NULL or else it won't be able to find the symbol
bytehook_stub_t stub_SDL_InitSubSystem = bytehook_hook_all_p(NULL, "SDL_InitSubSystem", &custom_SDL_InitSubSystem_Func, NULL, NULL);
LOGI("Successfully initialized SDL hooks, stubs: %p, %p\n", stub_SDL_InitSubSystem);
}

21
app_pojavlauncher/src/main/jni/utils.h
View File

@@ -13,16 +13,17 @@
#define DECL_DLSYM(fn) typedef typeof(&fn) fn##_t;
#define SET_DLSYM_PTR(fn) \
fn##_t fn##_p; \
do { \
dlerror(); \
void *_p = dlsym(RTLD_NEXT, #fn); \
const char *_e = dlerror(); \
if (_e || !_p) { \
LOGE("dlsym(%s) failed: %s\n", #fn, _e ? _e : "unknown error"); \
} \
fn##_p = (typeof(fn##_t))_p; \
#define SET_DLSYM_PTR(handle, fn) \
fn##_t fn##_p; \
do { \
dlerror(); \
void *_p = dlsym((handle), #fn); \
const char *_e = dlerror(); \
if (_e || !_p) { \
LOGE("dlsym(%s) failed: %s\n", \
#fn, _e ? _e : "unknown error"); \
} \
fn##_p = (fn##_t)_p; \
} while (0)
#define TRY_ATTACH_ENV(env_name, vm, error_message, then) JNIEnv* env_name;\