From efd548f869e47e6930f720efed6da52f9ab1bd1b Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Tue, 15 Sep 2020 19:11:02 +0700 Subject: [PATCH] Attempt fix Forge 1.16+ crash by safety EGL make current --- app/src/main/jni/egl_bridge.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/jni/egl_bridge.c b/app/src/main/jni/egl_bridge.c index 860d546a7..c27174968 100644 --- a/app/src/main/jni/egl_bridge.c +++ b/app/src/main/jni/egl_bridge.c @@ -45,10 +45,6 @@ void pojav_openGLOnUnload() { } JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, jclass clazz) { - return JNI_TRUE; -} - -JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz) { printf("EGLBridge: Initializing\n"); printf("ANativeWindow pointer = %p\n", potatoBridge.androidWindow); @@ -127,13 +123,12 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* assert(eglGetConfigAttrib(potatoBridge.eglDisplay, config, EGL_SURFACE_TYPE, &val)); assert(val & EGL_WINDOW_BIT); } - -/* return JNI_TRUE; } JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz) { -*/ + eglMakeCurrent(potatoBridge.eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + printf("EGLBridge: Making current\n"); printf("EGLContext=%p, EGLDisplay=%p, EGLSurface=%p\n", potatoBridge.eglContext,