From 949e562c0efc747be708a9bfd8598be0ed657807 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Thu, 19 Aug 2021 12:06:49 +0700 Subject: [PATCH] Regal stuff (test) --- JavaApp/src/main/java/org/lwjgl/opengl/GL.java | 5 +---- Natives/egl_bridge.m | 8 -------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java index 543ead72..bfb0b558 100644 --- a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java +++ b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java @@ -90,8 +90,6 @@ public final class GL { create(); } } - - private static native void nativeRegalMakeCurrent(); private GL() {} @@ -372,8 +370,7 @@ public final class GL { // This fixed framebuffer issue on 1.13+ 64-bit by another making current GLFW.nativeEglMakeCurrent(GLFW.mainContext); if (isUsingRegal) { - nativeRegalMakeCurrent(); - GLFW.nativeEglMakeCurrent(GLFW.mainContext); + callPV(callJ(functionProvider.getFunctionAddress("eglGetCurrentContext"), functionProvider.getFunctionAddress("RegalMakeCurrent")); } } else if (System.getenv("RENDERER").contains("zink")) { int[] dims = getNativeWidthHeight(); diff --git a/Natives/egl_bridge.m b/Natives/egl_bridge.m index 39344559..bab9db9d 100644 --- a/Natives/egl_bridge.m +++ b/Natives/egl_bridge.m @@ -161,14 +161,6 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglTerminate(JNIEnv* e return JNI_TRUE; } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nativeRegalMakeCurrent(JNIEnv *env, jclass clazz) { - debug("Regal: making current"); - - RegalMakeCurrent_func *RegalMakeCurrent = (RegalMakeCurrent_func *) dlsym(RTLD_DEFAULT, "RegalMakeCurrent"); - assert(RegalMakeCurrent); - RegalMakeCurrent(potatoBridge.eglContext); -} - bool stopMakeCurrent; JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglSwapBuffers(JNIEnv *env, jclass clazz) { jboolean result = (jboolean) eglSwapBuffers(potatoBridge.eglDisplay, eglGetCurrentSurface(EGL_DRAW));