From e8e9dba5862bce8dd2befd9177a496d4e6c2cd60 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <mathiasboulay@free.fr>
Date: Sun, 3 Apr 2022 22:01:00 +0200
Subject: [PATCH] Remove now useless hacks

---
 .../prefs/LauncherPreferences.java            |  7 -------
 .../net/kdt/pojavlaunch/utils/JREUtils.java   |  9 ---------
 .../src/main/res/xml/pref_experimental.xml    | 19 -------------------
 3 files changed, 35 deletions(-)

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 7bb68024a..9006757c4 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
@@ -34,9 +34,7 @@ public class LauncherPreferences {
     public static int PREF_CONTROL_LEFT_OFFSET = 0;
     public static boolean PREF_SUSTAINED_PERFORMANCE = false;
     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 boolean PREF_ARC_CAPES = false;
     public static boolean PREF_USE_ALTERNATE_SURFACE = true;
     public static int PREF_SCALE_FACTOR = 100;
@@ -70,9 +68,7 @@ public class LauncherPreferences {
         PREF_CONTROL_LEFT_OFFSET = DEFAULT_PREF.getInt("controlLeftOffset", 0);
         PREF_SUSTAINED_PERFORMANCE = DEFAULT_PREF.getBoolean("sustainedPerformance", false);
         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);
         PREF_ARC_CAPES = DEFAULT_PREF.getBoolean("arc_capes",false);
         PREF_USE_ALTERNATE_SURFACE = DEFAULT_PREF.getBoolean("alternate_surface", false);
         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=";
         for (String arg : JREUtils.parseJavaArguments(PREF_CUSTOM_JAVA_ARGS)) {
             if (arg.startsWith(argLwjglLibname)) {
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 2a9abd46e..e75cafe37 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
@@ -4,10 +4,7 @@ import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
 import static net.kdt.pojavlaunch.Architecture.is64BitsDevice;
 import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER;
 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_OPENGL_VERSION_HACK;
-import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_VBO_DISABLE_HACK;
 
 import android.app.*;
 import android.content.*;
@@ -202,12 +199,6 @@ public class JREUtils {
         // The shrink hack can be enabled from the experimental settings
         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
         envMap.put("LIBGL_NORMALIZE", "1");
    
diff --git a/app_pojavlauncher/src/main/res/xml/pref_experimental.xml b/app_pojavlauncher/src/main/res/xml/pref_experimental.xml
index cc2326d90..9d344558f 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_experimental.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_experimental.xml
@@ -12,24 +12,5 @@
             android:entries="@array/hack_gles_shrink"
             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>
 </PreferenceScreen>
\ No newline at end of file