Merge branch 'renderer/mobileglues' into 'main'

Author: crystall1nedev

.gitmodules

@@ -8,3 +8,7 @@
 [submodule "Natives/external/AFNetworking"]
 	path = Natives/external/AFNetworking
 	url = https://github.com/AFNetworking/AFNetworking
+[submodule "Natives/external/MobileGlues"]
+	path = Natives/external/MobileGlues
+	url = https://github.com/MobileGL-Dev/MobileGlues
+	branch = main

Makefile

@@ -295,6 +295,21 @@ jre: native
 	cp $(WORKINGDIR)/libawt_xawt.dylib $(OUTPUTDIR)/java_runtimes/java-21-openjdk/lib
 	echo '[Amethyst v$(VERSION)] jre - end'
 
+dep_mg: native
+	echo '[Amethyst v$(VERSION)] dep_mg - start'
+	cd $(SOURCEDIR)/Natives/external/MobileGlues/src/main/cpp; \
+	wget https://github.com/leetal/ios-cmake/raw/master/ios.toolchain.cmake; \
+	cmake -B build \
+		-DCMAKE_TOOLCHAIN_FILE=ios.toolchain.cmake \
+		-DSTATICLIB=OFF \
+		-DMACOS=ON \
+		-DPLATFORM=OS64 \
+		-DCMAKE_C_FLAGS=-Wno-error=implicit-function-declaration; \
+	cmake --build build --config RelWithDebInfo --target mobileglues; \
+	cp $(SOURCEDIR)/Natives/external/MobileGlues/src/main/cpp/build/libmobileglues.dylib $(WORKINGDIR)/libmobileglues.dylib
+	cp $(SOURCEDIR)/Natives/external/MobileGlues/src/main/cpp/libraries/ios/libspirv-cross-c-shared.0.dylib $(WORKINGDIR)/libspirv-cross-c-shared.0.dylib
+	echo '[Amethyst v$(VERSION)] dep_mg - end'
+
 assets:
 	echo '[Amethyst v$(VERSION)] assets - start'
 	if [ '$(IOS)' = '0' ] && [ '$(DETECTPLAT)' = 'Darwin' ]; then \
@@ -310,7 +325,7 @@ assets:
 	fi
 	echo '[Amethyst v$(VERSION)] assets - end'
 
-payload: native java jre assets
+payload: native dep_mg java jre assets
 	echo '[Amethyst v$(VERSION)] payload - start'
 	$(call METHOD_DIRCHECK,$(WORKINGDIR)/AngelAuraAmethyst.app/libs)
 	$(call METHOD_DIRCHECK,$(WORKINGDIR)/AngelAuraAmethyst.app/libs_caciocavallo)

Natives/LauncherPreferences.m

@@ -137,47 +137,28 @@ UIEdgeInsets getDefaultSafeArea() {
     NSMutableArray *array = @[
         @"auto",
         @ RENDERER_NAME_GL4ES,
-        @ RENDERER_NAME_MTL_ANGLE
+        @ RENDERER_NAME_MTL_ANGLE,
+        @ RENDERER_NAME_MOBILEGLUES,
+        @ RENDERER_NAME_VK_ZINK
     ].mutableCopy;
 
     if (containsDefault) {
         [array insertObject:@"(default)" atIndex:0];
     }
-
-#if CONFIG_RELEASE
-    if(@available(iOS 16.0, *)) {
-        // Disabling Zink on iOS 16.0+ to figure out what's wrong with it
-    } else {
-#endif
-        [array addObject:@ RENDERER_NAME_VK_ZINK];
-#if CONFIG_RELEASE
-    }
-#endif
+    
     return array;
 }
 
 NSArray* getRendererNames(BOOL containsDefault) {
     NSMutableArray *array;
 
-#if CONFIG_RELEASE
-    if(@available(iOS 16.0, *)) {
-        // Disabling Zink on iOS 16.0+ to figure out what's wrong with it
-        array = @[
-            localize(@"preference.title.renderer.release.auto", nil),
-            localize(@"preference.title.renderer.release.gl4es", nil),
-            localize(@"preference.title.renderer.release.angle", nil)
-        ].mutableCopy;
-    } else {
-#endif
-        array = @[
-            localize(@"preference.title.renderer.debug.auto", nil),
-            localize(@"preference.title.renderer.debug.gl4es", nil),
-            localize(@"preference.title.renderer.debug.angle", nil),
-            localize(@"preference.title.renderer.debug.zink", nil)
-        ].mutableCopy;
-#if CONFIG_RELEASE
-    }
-#endif
+    array = @[
+        localize(@"preference.title.renderer.debug.auto", nil),
+        localize(@"preference.title.renderer.debug.gl4es", nil),
+        localize(@"preference.title.renderer.debug.angle", nil),
+        localize(@"preference.title.renderer.debug.mg", nil),
+        localize(@"preference.title.renderer.debug.zink", nil)
+    ].mutableCopy;
 
     if (containsDefault) {
         [array insertObject:@"(default)" atIndex:0];

Natives/ctxbridges/gl_bridge.m

@@ -61,7 +61,7 @@ static bool gl_init() {
         EGL_ALPHA_SIZE, 8,
         EGL_DEPTH_SIZE, 24,
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+        EGL_RENDERABLE_TYPE, angleDesktopGL ? EGL_OPENGL_BIT : EGL_OPENGL_ES3_BIT,
         EGL_NONE
     };
 
@@ -82,8 +82,13 @@ static bool gl_init() {
     }
 
     EGLBoolean bindResult;
-    NSDebugLog(@"EGLBridge: Binding to desktop OpenGL (regardless of renderer)");
-    bindResult = handle.eglBindAPI(EGL_OPENGL_API);
+    if (angleDesktopGL) {
+        NSDebugLog(@"EGLBridge: Binding to desktop OpenGL");
+        bindResult = handle.eglBindAPI(EGL_OPENGL_API);
+    } else {
+        NSDebugLog(@"EGLBridge: Binding to OpenGL ES");
+        bindResult = handle.eglBindAPI(EGL_OPENGL_ES_API);
+    }
     if (!bindResult) NSDebugLog(@"EGLBridge: bind failed: %p\n", handle.eglGetError());
 
     bundle->surface = handle.eglCreateWindowSurface(g_EglDisplay, bundle->config, (__bridge EGLNativeWindowType)SurfaceViewController.surface.layer, NULL);

Natives/egl_bridge.m

@@ -56,6 +56,10 @@ int pojavInitOpenGL() {
         renderer = @ RENDERER_NAME_GL4ES;
         setenv("POJAV_RENDERER", renderer.UTF8String, 1);
         set_gl_bridge_tbl();
+    } else if ([renderer isEqualToString:@ RENDERER_NAME_MOBILEGLUES]) {
+        renderer = @ RENDERER_NAME_MOBILEGLUES;
+        setenv("POJAV_RENDERER", renderer.UTF8String, 1);
+        set_gl_bridge_tbl();
     } else if ([renderer isEqualToString:@ RENDERER_NAME_MTL_ANGLE]) {
         set_gl_bridge_tbl();
     } else if ([renderer hasPrefix:@"libOSMesa"]) {

Natives/external/MobileGlues

@@ -177,11 +177,13 @@
 "preference.title.renderer.release.auto" = "Auto";
 "preference.title.renderer.release.gl4es" = "holy gl4es";
 "preference.title.renderer.release.angle" = "ANGLE";
+"preference.title.renderer.release.mg" = "MobileGlues";
 "preference.title.renderer.release.zink" = "Zink";
 
 "preference.title.renderer.debug.auto" = "Auto: gl4es or ANGLE";
 "preference.title.renderer.debug.gl4es" = "holy gl4es - exports OpenGL 2.1";
 "preference.title.renderer.debug.angle" = "ANGLE (1.17+) - exports OpenGL 3.2 (Core Profile, limited)";
+"preference.title.renderer.debug.mg" = "MobileGlues (1.17+) - exports OpenGL 4.0, EXPERIMENTAL";
 "preference.title.renderer.debug.zink" = "Zink (Mesa 21.0) - exports OpenGL 4.1";
 
 "preference.detail.renderer" = "Change the OpenGL render engine to use. Zink is temporarily disabled on iOS 16 and later to diagnose issues.";

Natives/resources/en.lproj/Localizable.strings

@@ -36,6 +36,7 @@
 
 #define RENDERER_NAME_GL4ES "libgl4es_114.dylib"
 #define RENDERER_NAME_MTL_ANGLE "libtinygl4angle.dylib"
+#define RENDERER_NAME_MOBILEGLUES "libmobileglues.dylib"
 #define RENDERER_NAME_VK_ZINK "libOSMesa.8.dylib"
 
 #define SPECIALBTN_KEYBOARD -1