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

Remove now useless hacks

Browse Source
This commit is contained in:
SerpentSpirale 2022-04-03 22:01:00 +02:00
parent 7256ea18df
commit e8e9dba586
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
View File

@ -34,9 +34,7 @@ public class LauncherPreferences {
public static int PREF_CONTROL_LEFT_OFFSET = 0; public static int PREF_CONTROL_LEFT_OFFSET = 0;
public static boolean PREF_SUSTAINED_PERFORMANCE = false; public static boolean PREF_SUSTAINED_PERFORMANCE = false;
public static String PREF_GLES_SHRINK_HACK = "0"; 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_VIRTUAL_MOUSE_START = false;
public static boolean PREF_OPENGL_VERSION_HACK = false;
public static boolean PREF_ARC_CAPES = false; public static boolean PREF_ARC_CAPES = false;
public static boolean PREF_USE_ALTERNATE_SURFACE = true; public static boolean PREF_USE_ALTERNATE_SURFACE = true;
public static int PREF_SCALE_FACTOR = 100; public static int PREF_SCALE_FACTOR = 100;
@ -70,9 +68,7 @@ public class LauncherPreferences {
PREF_CONTROL_LEFT_OFFSET = DEFAULT_PREF.getInt("controlLeftOffset", 0); PREF_CONTROL_LEFT_OFFSET = DEFAULT_PREF.getInt("controlLeftOffset", 0);
PREF_SUSTAINED_PERFORMANCE = DEFAULT_PREF.getBoolean("sustainedPerformance", false); PREF_SUSTAINED_PERFORMANCE = DEFAULT_PREF.getBoolean("sustainedPerformance", false);
PREF_GLES_SHRINK_HACK = DEFAULT_PREF.getString("gl4es_shrink_hack", "0"); 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_VIRTUAL_MOUSE_START = DEFAULT_PREF.getBoolean("mouse_start", false);
PREF_OPENGL_VERSION_HACK = DEFAULT_PREF.getBoolean("gles_version_hack", false);
PREF_ARC_CAPES = DEFAULT_PREF.getBoolean("arc_capes",false); PREF_ARC_CAPES = DEFAULT_PREF.getBoolean("arc_capes",false);
PREF_USE_ALTERNATE_SURFACE = DEFAULT_PREF.getBoolean("alternate_surface", false); PREF_USE_ALTERNATE_SURFACE = DEFAULT_PREF.getBoolean("alternate_surface", false);
PREF_SCALE_FACTOR = DEFAULT_PREF.getInt("resolutionRatio", 100); PREF_SCALE_FACTOR = DEFAULT_PREF.getInt("resolutionRatio", 100);
@ -105,9 +101,6 @@ public class LauncherPreferences {
} }
*/ */
if (PREF_RENDERER.equals("2") || PREF_RENDERER.equals("3")) {
PREF_RENDERER = "opengles" + PREF_RENDERER;
}
String argLwjglLibname = "-Dorg.lwjgl.opengl.libname="; String argLwjglLibname = "-Dorg.lwjgl.opengl.libname=";
for (String arg : JREUtils.parseJavaArguments(PREF_CUSTOM_JAVA_ARGS)) { for (String arg : JREUtils.parseJavaArguments(PREF_CUSTOM_JAVA_ARGS)) {
if (arg.startsWith(argLwjglLibname)) { if (arg.startsWith(argLwjglLibname)) {

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

@ -4,10 +4,7 @@ import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
import static net.kdt.pojavlaunch.Architecture.is64BitsDevice; import static net.kdt.pojavlaunch.Architecture.is64BitsDevice;
import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER; import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER;
import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics; import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_BUTTONSIZE;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_GLES_SHRINK_HACK; 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.*; import android.app.*;
import android.content.*; import android.content.*;
@ -202,12 +199,6 @@ public class JREUtils {
// The shrink hack can be enabled from the experimental settings // The shrink hack can be enabled from the experimental settings
envMap.put("LIBGL_SHRINK", PREF_GLES_SHRINK_HACK); envMap.put("LIBGL_SHRINK", PREF_GLES_SHRINK_HACK);
// VBO disable hack
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 // Fix white color on banner and sheep, since GL4ES 1.1.5
envMap.put("LIBGL_NORMALIZE", "1"); envMap.put("LIBGL_NORMALIZE", "1");

19
app_pojavlauncher/src/main/res/xml/pref_experimental.xml
View File

@ -12,24 +12,5 @@
android:entries="@array/hack_gles_shrink" android:entries="@array/hack_gles_shrink"
app2:useSimpleSummaryProvider="true"/> app2:useSimpleSummaryProvider="true"/>
<SwitchPreference
android:title="@string/vbo_hack_title"
android:summary="@string/vbo_hack_description"
android:defaultValue="false"
android:key="vbo_disable_hack"
/>
<CheckBoxPreference
android:defaultValue="false"
android:key="enable_profiles"
android:title="@string/option_enable_profiles"
android:summary="@string/option_enable_profiles_descritption"/>
<SwitchPreference
android:title="@string/gles_version_hack_title"
android:summary="@string/gles_version_hack_description"
android:defaultValue="false"
android:key="gles_version_hack"
/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>