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

Disable OpenGL validation check in EGL, bind to desktop GL on ANGLE

Browse Source
This commit is contained in:
ArtDev 2021-09-05 12:40:14 +03:00
parent a05600e597
commit 537581c21d
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -226,7 +226,7 @@ public class JREUtils {
if(LOCAL_RENDERER != null) {
envMap.put("POJAV_RENDERER", LOCAL_RENDERER);
}
if(LOCAL_RENDERER.equals("opengles3_angle_vulkan")) envMap.put("POJAVEXEC_EGL","libEGL_angle.so"); // use ANGLE egl
if(LOCAL_RENDERER.equals("opengles3_desktopgl_angle_vulkan")) envMap.put("POJAVEXEC_EGL","libEGL_angle.so"); // use ANGLE egl
envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth > 0 ? CallbackBridge.windowWidth : CallbackBridge.physicalWidth));
envMap.put("AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight > 0 ? CallbackBridge.windowHeight : CallbackBridge.physicalHeight));
@ -416,7 +416,7 @@ public class JREUtils {
case "opengles3": renderLibrary = "libgl4es_115.so"; break;
case "vulkan_zink": renderLibrary = "libOSMesa_8.so"; break;
case "opengles3_vgpu" : renderLibrary = "libvgpu.so"; break;
case "opengles3_angle_vulkan" : renderLibrary = "libtinywrapper.so"; break;
case "opengles3_desktopgl_angle_vulkan" : renderLibrary = "libtinywrapper.so"; break;
default:
Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");
renderLibrary = "libgl4es_114.so";

14
app_pojavlauncher/src/main/jni/egl_bridge.c
View File

@ -785,9 +785,17 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, j
}
ANativeWindow_setBuffersGeometry(potatoBridge.androidWindow, 0, 0, vid);
eglBindAPI_p(EGL_OPENGL_ES_API);
{
EGLBoolean bindResult;
if (strncmp(renderer, "opengles3_desktopgl", 19) == 0) {
printf("EGLBridge: Binding to desktop OpenGL\n");
bindResult = eglBindAPI_p(EGL_OPENGL_API);
} else {
printf("EGLBridge: Binding to OpenGL ES\n");
bindResult = eglBindAPI_p(EGL_OPENGL_ES_API);
}
if(!bindResult) printf("EGLBridge: bind failed: %p\n", eglGetError_p());
}
potatoBridge.eglSurface = eglCreateWindowSurface_p(potatoBridge.eglDisplay, config, potatoBridge.androidWindow, NULL);
if (!potatoBridge.eglSurface) {

BIN
app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/arm64-v8a/libGLESv2_angle.so
View File

Binary file not shown.

2
app_pojavlauncher/src/main/res/values/headings_array.xml
View File

@ -22,6 +22,6 @@
<item>opengles3</item> <!-- gl4es 1.1.5 with OpenGL ES 3 -->
<item>vulkan_zink</item>
<item>opengles3_vgpu</item> <!-- vgpu with OpenGL ES 3 -->
<item>opengles3_angle_vulkan</item>
<item>opengles3_desktopgl_angle_vulkan</item>
</string-array>
</resources>