diff --git a/Natives/egl_bridge.c b/Natives/egl_bridge.c index 5f5bb970..2d69d4d8 100644 --- a/Natives/egl_bridge.c +++ b/Natives/egl_bridge.c @@ -47,15 +47,6 @@ JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_saveGLContext(JNI debug("OpenGLES context is NULL..."); assert(CURR_GL_CONTEXT != NULL); } - assert(makeCurrentContext(CURR_GL_CONTEXT)); - debug("makeCurrent success"); - - void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); - debug("libGL = %p", libGL); - gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(libGL, "initialize_gl4es"); - debug("initialize_gl4es = %p", gl4esInitialize); - gl4esInitialize(); - debug("GL4ES init success"); } JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglGetCurrentContext(JNIEnv* env, jclass clazz) { @@ -68,8 +59,19 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, j */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz, jlong window) { debug("ES2Bridge: making current\n"); - jboolean ret = 1; // makeCurrentContext(CURR_GL_CONTEXT); + + jboolean ret = makeCurrentContext(CURR_GL_CONTEXT); debug("ES2Bridge: makeCurrent() returns %d\n", ret); + + void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); + debug("libGL = %p", libGL); + + gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(libGL, "initialize_gl4es"); + debug("initialize_gl4es = %p", gl4esInitialize); + + gl4esInitialize(); + debug("GL4ES init success"); + return ret; } diff --git a/Natives/resources/Frameworks/libGL.dylib b/Natives/resources/Frameworks/libGL.dylib index bbac02d9..4e5670fb 100644 Binary files a/Natives/resources/Frameworks/libGL.dylib and b/Natives/resources/Frameworks/libGL.dylib differ