From 10e4187a7674f7e3b0a280128e4e66a0091cc71b Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Thu, 6 Jan 2022 23:58:52 +0100 Subject: [PATCH] New eXperimental option: force gles 1 --- .../net/kdt/pojavlaunch/prefs/LauncherPreferences.java | 2 ++ .../src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 6 +++++- app_pojavlauncher/src/main/res/values/strings.xml | 2 ++ app_pojavlauncher/src/main/res/xml/pref_experimental.xml | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index d4dbe951d..f005a4389 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -37,6 +37,7 @@ public class LauncherPreferences public static String PREF_GLES_SHRINK_HACK = "0"; public static boolean PREF_VBO_DISABLE_HACK = false; public static boolean PREF_VIRTUAL_MOUSE_START = false; + public static boolean PREF_OPENGL_VERSION_HACK = false; public static void loadPreferences(Context ctx) { @@ -69,6 +70,7 @@ public class LauncherPreferences PREF_GLES_SHRINK_HACK = DEFAULT_PREF.getString("gl4es_shrink_hack", "0"); PREF_VBO_DISABLE_HACK = DEFAULT_PREF.getBoolean("vbo_disable_hack", false); PREF_VIRTUAL_MOUSE_START = DEFAULT_PREF.getBoolean("mouse_start", false); + PREF_OPENGL_VERSION_HACK = DEFAULT_PREF.getBoolean("gles_version_hack", false); /* if (PREF_CUSTOM_JAVA_ARGS.isEmpty()) { 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 46a84023a..1e1dfcf7c 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 @@ -5,6 +5,7 @@ import static net.kdt.pojavlaunch.Architecture.archAsString; import static net.kdt.pojavlaunch.Architecture.is64BitsDevice; import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER; import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_GLES_SHRINK_HACK; +import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_OPENGL_VERSION_HACK; import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_VBO_DISABLE_HACK; import android.app.*; @@ -217,7 +218,10 @@ public class JREUtils { envMap.put("LIBGL_SHRINK", PREF_GLES_SHRINK_HACK); // VBO disable hack - if(PREF_VBO_DISABLE_HACK) envMap.put("LIBGL_USEVBO","0"); + if (PREF_VBO_DISABLE_HACK) envMap.put("LIBGL_USEVBO","0"); + + // openGL version hack + if (PREF_OPENGL_VERSION_HACK) envMap.put("LIBGL_ES", "1"); // Fix white color on banner and sheep, since GL4ES 1.1.5 envMap.put("LIBGL_NORMALIZE", "1"); diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml index 7d5b10f85..35db18ff6 100644 --- a/app_pojavlauncher/src/main/res/values/strings.xml +++ b/app_pojavlauncher/src/main/res/values/strings.xml @@ -288,5 +288,7 @@ Disable VBOs Help with compatibility on some old versions + Force openGL 1 + Help with compatibility on some old versions diff --git a/app_pojavlauncher/src/main/res/xml/pref_experimental.xml b/app_pojavlauncher/src/main/res/xml/pref_experimental.xml index f491e3cc6..67edc6beb 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_experimental.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_experimental.xml @@ -19,5 +19,12 @@ android:key="vbo_disable_hack" /> + + \ No newline at end of file