diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..8549fb41d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "MobileGlues"]
+ path = MobileGlues
+ url = https://github.com/MobileGL-Dev/MobileGlues.git
diff --git a/MobileGlues b/MobileGlues
new file mode 160000
index 000000000..f3e9fb7eb
--- /dev/null
+++ b/MobileGlues
@@ -0,0 +1 @@
+Subproject commit f3e9fb7eb30d454c6b1916e620e5d90ffc6f2eb4
diff --git a/Task b/Task
new file mode 100644
index 000000000..e69de29bb
diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle
index aafdd1efb..586099573 100644
--- a/app_pojavlauncher/build.gradle
+++ b/app_pojavlauncher/build.gradle
@@ -155,6 +155,7 @@ android {
gplay {
initWith release
signingConfig signingConfigs.googlePlayBuild
+ matchingFallbacks = [ 'release' ]
}
}
@@ -228,4 +229,6 @@ dependencies {
// implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+
+ implementation project(":MobileGlues")
}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
index 4d44644d6..fa378f1c4 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -469,6 +469,7 @@ public class JREUtils {
case "opengles3":
renderLibrary = "libgl4es_114.so"; break;
case "vulkan_zink": renderLibrary = "libOSMesa.so"; break;
+ case "opengles_mobileglues": renderLibrary = "libmobileglues.so"; break;
case "opengles3_ltw" : renderLibrary = "libltw.so"; break;
default:
Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");
diff --git a/app_pojavlauncher/src/main/jni/Application.mk b/app_pojavlauncher/src/main/jni/Application.mk
index ce2ec9f16..b1569897c 100644
--- a/app_pojavlauncher/src/main/jni/Application.mk
+++ b/app_pojavlauncher/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
# NDK_TOOLCHAIN_VERSION := 4.9
APP_PLATFORM := android-21
-APP_STL := system
+APP_STL := c++_shared
# APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
diff --git a/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_pojavlauncher/src/main/jni/egl_bridge.c
index b1d56b8f0..7d1d81553 100644
--- a/app_pojavlauncher/src/main/jni/egl_bridge.c
+++ b/app_pojavlauncher/src/main/jni/egl_bridge.c
@@ -171,7 +171,7 @@ int pojavInitOpenGL() {
load_vulkan();
setenv("GALLIUM_DRIVER","zink",1);
set_osm_bridge_tbl();
- }
+ } else printf("EGLBridge: Renderer was not configured as a bridge. Consider adding \"opengles\" to the start of renderer name if it crashes");
if(br_init()) {
br_setup_window();
}
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
index 5f4bd3c91..aada27344 100644
--- a/app_pojavlauncher/src/main/res/values/headings_array.xml
+++ b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -3,7 +3,8 @@
- @string/mcl_setting_renderer_gles2_4
- @string/mcl_setting_renderer_vulkan_zink
- - @string/mcl_setting_renderer_ltw
+ - @string/mcl_setting_renderer_mobileglues
+ - @string/mcl_setting_renderer_ltw
@@ -37,6 +38,7 @@
- opengles2
- vulkan_zink
+ - opengles_mobileglues
- opengles3_ltw
diff --git a/settings.gradle b/settings.gradle
index 0f0ae5d15..6a4988a24 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,4 +19,5 @@ include ':jre_lwjgl3glfw'
include ':app_pojavlauncher'
include ':arc_dns_injector'
-include ':forge_installer'
\ No newline at end of file
+include ':forge_installer'
+include ':MobileGlues'