Swap to krypton wrapper

README.md

@@ -123,6 +123,7 @@ Amethyst is licensed under [GNU LGPLv3](https://github.com/AngelAuraMC/Amethyst-
 * Android Support Libraries: [Apache License 2.0](https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/NOTICE.txt).
 * [GL4ES](https://github.com/AngelAuraMC/gl4es): [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).
 * [MobileGlues](https://github.com/MobileGL-Dev/MobileGlues): [LGPL-2.1 License](https://github.com/MobileGL-Dev/MobileGlues/blob/dev-es/LICENSE).
+* [Krypton Wrapper](https://github.com/BZLZHH/NG-GL4ES): [MIT License](https://github.com/BZLZHH/NG-GL4ES/blob/main/LICENSE)
 * [ANGLE](https://chromium.googlesource.com/angle/angle): [All Rights Reserved](app_pojavlauncher/src/main/assets/licenses/ANGLE_LICENSE).
 * [OpenJDK](https://github.com/AngelAuraMC/openjdk-multiarch-jdk8u): [GNU GPLv2 License](https://openjdk.java.net/legal/gplv2+ce.html).
 * [LWJGL3](https://github.com/AngelAuraMC/lwjgl3): [BSD-3 License](https://github.com/LWJGL/lwjgl3/blob/master/LICENSE.md).

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java

@@ -182,7 +182,9 @@ public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surface) {
                 }
 
                 @Override
-                public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {}
+                public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {
+                    // TODO: Triggers on eglSwapBuffers. Add a loading message and make it end here
+                }
             });
 
             ((ViewGroup)getParent()).addView(textureView);

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java

@@ -483,22 +483,22 @@ public static String loadGraphicsLibrary(){
             case "opengles2":
             case "opengles2_5":
             case "opengles3":
-                renderLibrary = "libgl4es_115.so"; break;
+                renderLibrary = "libng_gl4es.so"; break;
             case "vulkan_zink": renderLibrary = "libOSMesa.so"; break;
             case "opengles_mobileglues": renderLibrary = "libmobileglues.so"; break;
             case "opengles3_desktopgl_zink_kopper": renderLibrary = "libglxshim.so"; break;
             case "opengles3_ltw" : renderLibrary = "libltw.so"; break;
             default:
                 Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");
-                renderLibrary = "libgl4es_115.so";
+                renderLibrary = "libng_gl4es.so";
                 break;
         }
 
         if (!dlopen(renderLibrary) && !dlopen(findInLdLibPath(renderLibrary))) {
-            Log.e("RENDER_LIBRARY","Failed to load renderer " + renderLibrary + ". Falling back to GL4ES 1.1.4");
+            Log.e("RENDER_LIBRARY","Failed to load renderer " + renderLibrary + ". Falling back to Krypton Wrapper");
             LOCAL_RENDERER = "opengles2";
-            renderLibrary = "libgl4es_115.so";
-            dlopen(NATIVE_LIB_DIR + "/libgl4es_115.so");
+            renderLibrary = "libng_gl4es.so";
+            dlopen(NATIVE_LIB_DIR + "/libng_gl4es.so");
         }
         return renderLibrary;
     }

app_pojavlauncher/src/main/res/values/headings_array.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="renderer">
-        <item name="0">@string/mcl_setting_renderer_gles2_4</item>
+        <item name="0">@string/mcl_setting_renderer_ng_gl4es</item>
         <item name="1">@string/mcl_setting_renderer_vulkan_kopper_zink</item>
         <item name="2">@string/mcl_setting_renderer_vulkan_zink</item>
         <item name="3">@string/mcl_setting_renderer_mobileglues</item>
@@ -37,8 +37,9 @@
     </string-array>
 
     <string-array name="renderer_values">
-        <item>opengles2</item> <!-- gl4es_extra 1.1.4 with OpenGL ES 2/"3" -->
-        <item>opengles3_desktopgl_zink_kopper</item>        <item>vulkan_zink</item> <!-- virglrenderer with OpenGL ES 3 -->
+        <item>opengles2</item> <!-- BZLZHH/NG-GL4ES (Krypton Wrapper) -->
+        <item>opengles3_desktopgl_zink_kopper</item> <!-- Swung's Kopper Zink backport to 23.0.4 -->
+        <item>vulkan_zink</item> <!-- osmesa 23.0.4 -->
         <item>opengles_mobileglues</item>
         <item>opengles3_ltw</item>
     </string-array>

app_pojavlauncher/src/main/res/values/strings.xml

@@ -66,6 +66,7 @@
     <string name="mcl_setting_title_renderer_subtitle">Renderer specific settings</string>
     <string name="mcl_setting_category_renderer">Renderer</string>
     <string name="mcl_setting_renderer_gles2_4">Holy GL4ES - (1.21.4&lt; only, fast)</string>
+    <string name="mcl_setting_renderer_ng_gl4es">Krypton Wrapper - (all versions, fast)</string>
     <string name="mcl_setting_renderer_vulkan_zink">Zink (Vulkan) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_mobileglues">MobileGlues (OpenGL ES) - (1.17+ only, fast)</string>
     <string name="mcl_setting_renderer_ltw">LTW (OpenGL ES 3) - 1.17+ only</string>

jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java

@@ -1057,6 +1057,10 @@ public static long glfwCreateWindow(int width, int height, CharSequence title, l
             glMajor = 4;
             glMinor = 0;
         }
+
+        // This somehow fixes a bunch of issues like glGetString sigsegv'ing on krypton wrapper.
+        glfwMakeContextCurrent(ptr);
+
         // Get the real values properly
         FunctionProvider functionProvider = org.lwjgl.opengl.GL.getFunctionProvider();
         if (functionProvider != null) {

jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/PojavRendererInit.java

@@ -26,7 +26,7 @@ public static void onCreateCapabilities(FunctionProvider functionProvider) {
                                 "Renderer-specific initialization may not work properly");
         }
         // NOTE: hardcoded gl4es libname
-        if(rendererName.endsWith("libgl4es_115.so")) {
+        if(rendererName.endsWith("libng_gl4es.so")) {
             nativeInitGl4esInternals(functionProvider);
         }
     }