TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 08:05:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Multiple changes

Browse Source 
- Disable ClassWrapper
- Try get multiple GL contexts
This commit is contained in:
khanhduytran0 2020-10-12 16:39:46 +07:00
parent 8989a09326
commit d606d25bea
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -105,14 +105,15 @@ public final class Tools
getJavaArgs(ctx, javaArgList); getJavaArgs(ctx, javaArgList);
javaArgList.add("-cp"); javaArgList.add("-cp");
/*
if (versionInfo.mainClass.equals("net.minecraft.launchwrapper.Launch")) { if (versionInfo.mainClass.equals("net.minecraft.launchwrapper.Launch")) {
// Also preload LWJGL3 to fix crash on send input events // Also preload LWJGL3 to fix crash on send input events
javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar:" + getLWJGL3ClassPath()); javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar:" + getLWJGL3ClassPath());
javaArgList.add("ClassWrapper"); javaArgList.add("ClassWrapper");
javaArgList.add(launchClassPath); javaArgList.add(launchClassPath);
} else { } else { */
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath); javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
} // }
javaArgList.add(versionInfo.mainClass); javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs)); javaArgList.addAll(Arrays.asList(launchArgs));

15
app/src/main/jni/egl_bridge.c
View File

@ -30,6 +30,7 @@ struct PotatoBridge {
*/ */
}; };
struct PotatoBridge potatoBridge; struct PotatoBridge potatoBridge;
EGLConfig config;
typedef jint RegalMakeCurrent_func(EGLContext context); typedef jint RegalMakeCurrent_func(EGLContext context);
@ -58,11 +59,20 @@ void terminateEgl() {
potatoBridge.eglSurface = EGL_NO_SURFACE; potatoBridge.eglSurface = EGL_NO_SURFACE;
} }
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglGetCurrentContext(JNIEnv* env, jclass clazz) {
return (jlong) (uintptr_t) potatoBridge.eglContext;
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, jclass clazz) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, jclass clazz) {
return JNI_TRUE; return JNI_TRUE;
} }
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz) {
static const EGLint ctx_attribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE
};
if (potatoBridge.eglContext != EGL_NO_CONTEXT) { if (potatoBridge.eglContext != EGL_NO_CONTEXT) {
potatoBridge.eglContextOld = potatoBridge.eglContext; potatoBridge.eglContextOld = potatoBridge.eglContext;
potatoBridge.eglContext = eglCreateContext(potatoBridge.eglDisplay, config, potatoBridge.eglContextOld, ctx_attribs); potatoBridge.eglContext = eglCreateContext(potatoBridge.eglDisplay, config, potatoBridge.eglContextOld, ctx_attribs);
@ -93,12 +103,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv*
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE EGL_NONE
}; };
static const EGLint ctx_attribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE
};
EGLConfig config;
EGLint num_configs; EGLint num_configs;
EGLint vid; EGLint vid;