From fc2552fa0e71d03c254b07e5d9362c3650395228 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Sat, 2 Jan 2021 12:21:57 +0700 Subject: [PATCH] Debug and fixes --- JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java | 6 +++--- Natives/egl_bridge.c | 14 +++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java index af117524..13ebd07b 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java @@ -567,7 +567,7 @@ public class GLFW } private static native long nativeEglGetCurrentContext(); - private static native boolean nativeEglInit(); + // private static native boolean nativeEglInit(); public static native boolean nativeEglMakeCurrent(long window); private static native boolean nativeEglTerminate(); private static native boolean nativeEglSwapBuffers(); @@ -768,7 +768,7 @@ public class GLFW public static boolean glfwInit() { mGLFWInitialTime = (double) System.nanoTime(); - return nativeEglInit(); + return true; // nativeEglInit(); } public static void glfwTerminate() { @@ -944,7 +944,7 @@ public class GLFW if (!nativeEglMakeCurrent(window)) { throw new RuntimeException("eglMakeCurrent() failed, check log file for more details"); } - mGLFWCurrentGLContextThread = currentGLThreadID; + mGLFWCurrentGLContextThread = currentGLThreadId; } else { System.out.println("GLFW: glfwMakeContextCurrent() request is skipped"); } diff --git a/Natives/egl_bridge.c b/Natives/egl_bridge.c index 2eec4fe6..10990b1b 100644 --- a/Natives/egl_bridge.c +++ b/Natives/egl_bridge.c @@ -52,19 +52,15 @@ JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_saveGLContext(JNI JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglGetCurrentContext(JNIEnv* env, jclass clazz) { return (jlong) (uintptr_t) CURR_GL_CONTEXT; } - +/* 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, jlong window) { - debug("ES2Bridge: Initializing\n"); - jboolean ret = makeCurrentContext(CURR_GL_CONTEXT); -/* - void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); - gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(libGL, "gl4es_initialize"); - gl4esInitialize(); */ +JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz, jlong window) { + debug("ES2Bridge: making current\n"); + jboolean ret = makeCurrentContext(CURR_GL_CONTEXT); + debug("ES2Bridge: makeCurrent() returns %d\n", ret); return ret; }