diff --git a/MobileGlues b/MobileGlues index 0b41cd6a3..0502bdf19 160000 --- a/MobileGlues +++ b/MobileGlues @@ -1 +1 @@ -Subproject commit 0b41cd6a387989b2e7ce4a05cf4f7c9f7f027b38 +Subproject commit 0502bdf1968672b612b2b2e38e23dd38fe5e37e7 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 1fe730977..19c9602b3 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 @@ -236,16 +236,19 @@ public class LauncherPreferences { // Using .getInt() leads to a class cast exception and using integer-arrays will just crash the layout/fragment. MGConfigJson.put("enableANGLE", Integer.parseInt(DEFAULT_PREF.getString("mg_renderer_setting_angle", "0"))); MGConfigJson.put("enableNoError", Integer.parseInt(DEFAULT_PREF.getString("mg_renderer_setting_errorSetting", "0"))); + MGConfigJson.put("fsr1Setting", Integer.parseInt(DEFAULT_PREF.getString("mg_renderer_setting_fsr", "0"))); // These guys are SwitchPreferences so they get special treatment, they need to be converted to ints int gl43exts = DEFAULT_PREF.getBoolean("mg_renderer_setting_gl43ext", false) ? 1 : 0; int computeShaderext = DEFAULT_PREF.getBoolean("mg_renderer_computeShaderext", false) ? 1 : 0; int angleDepthClearFixMode = DEFAULT_PREF.getBoolean("mg_renderer_setting_angleDepthClearFixMode", false) ? 1 : 0; int timerQueryExt = DEFAULT_PREF.getBoolean("mg_renderer_setting_timerQueryExt", false) ? 1 : 0; + int dsaExt = DEFAULT_PREF.getBoolean("mg_renderer_dsaExt", false) ? 1 : 0; MGConfigJson.put("enableExtGL43", gl43exts); MGConfigJson.put("enableExtComputeShader", computeShaderext); MGConfigJson.put("angleDepthClearFixMode", angleDepthClearFixMode); MGConfigJson.put("enableExtTimerQuery", timerQueryExt); + MGConfigJson.put("enableExtDirectStateAccess", dsaExt); if (DEFAULT_PREF.getBoolean("mg_renderer_multidrawCompute", false)) { MGConfigJson.put("multidrawMode", 5); // Special handling for the (special mayhaps) compute emulation } else MGConfigJson.put("multidrawMode", Integer.parseInt(DEFAULT_PREF.getString("mg_renderer_setting_multidraw", "0"))); 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 41fb5829e..2d5c6185d 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 @@ -221,6 +221,7 @@ public class JREUtils { } if(LOCAL_RENDERER.equals("opengles_mobileglues")){ envMap.put("MG_DIR_PATH", Tools.DIR_DATA + "/MobileGlues"); + envMap.put("POJAVEXEC_EGL","libmobileglues.so"); } } if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("POJAV_BIG_CORE_AFFINITY", "1"); diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml index f75c27c01..2114f3409 100644 --- a/app_pojavlauncher/src/main/res/values/headings_array.xml +++ b/app_pojavlauncher/src/main/res/values/headings_array.xml @@ -90,4 +90,18 @@ 3 4 + + Disabled + Performance + Balanced + Quality + Ultra Quality + + + 0 + 4 + 3 + 2 + 1 + diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml index 9415f7874..2d4912ea3 100644 --- a/app_pojavlauncher/src/main/res/values/strings.xml +++ b/app_pojavlauncher/src/main/res/values/strings.xml @@ -482,5 +482,8 @@ You are using a version of Legacy4J without the android fixes! You will need to manually enable SDL in the controller settings to get the best experience! Warning! Controllable currently has a random chance of crashing on launch. Either keep trying again and hope it launches or use another mod like Controlify. + Advertise Experimental Direct State Access extension + May help with Iris shaderpacks, required for AcceleratedRendering mod + AMD FSR 1 Upscaling Auto-renderer select failed, defaulting to HolyGL4ES diff --git a/app_pojavlauncher/src/main/res/xml/pref_renderer.xml b/app_pojavlauncher/src/main/res/xml/pref_renderer.xml index eeb836d72..45baceaf9 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_renderer.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_renderer.xml @@ -24,6 +24,13 @@ android:entries="@array/mg_renderer_names_multidraw" android:entryValues="@array/mg_renderer_values_multidraw" app2:useSimpleSummaryProvider="true"/> + +