mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2026-04-21 18:17:07 -04:00
Merge pull request #68 from alexytomi/update-MobileGlues
Bump MobileGlues to 1.3.3 stable
This commit is contained in:
Submodule MobileGlues updated: 0b41cd6a38...0502bdf196
@@ -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")));
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -90,4 +90,18 @@
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
</string-array>
|
||||
<string-array name="mg_renderer_names_fsr">
|
||||
<item>Disabled</item>
|
||||
<item>Performance</item>
|
||||
<item>Balanced</item>
|
||||
<item>Quality</item>
|
||||
<item>Ultra Quality</item>
|
||||
</string-array>
|
||||
<string-array name="mg_renderer_values_fsr">
|
||||
<item>0</item>
|
||||
<item>4</item>
|
||||
<item>3</item>
|
||||
<item>2</item>
|
||||
<item>1</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
||||
@@ -482,5 +482,8 @@
|
||||
<string name="oldL4JFound">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!</string>
|
||||
<string name="global_warning">Warning!</string>
|
||||
<string name="controllableFound">Controllable currently has a random chance of crashing on launch. Either keep trying again and hope it launches or use another mod like Controlify.</string>
|
||||
<string name="mg_renderer_title_dsaExt">Advertise Experimental Direct State Access extension</string>
|
||||
<string name="mg_renderer_summary_dsaExt">May help with Iris shaderpacks, required for AcceleratedRendering mod</string>
|
||||
<string name="mg_renderer_title_fsr">AMD FSR 1 Upscaling</string>
|
||||
<string name="autorendererselectfailed">Auto-renderer select failed, defaulting to HolyGL4ES</string>
|
||||
</resources>
|
||||
|
||||
@@ -24,6 +24,13 @@
|
||||
android:entries="@array/mg_renderer_names_multidraw"
|
||||
android:entryValues="@array/mg_renderer_values_multidraw"
|
||||
app2:useSimpleSummaryProvider="true"/>
|
||||
<androidx.preference.ListPreference
|
||||
android:title="@string/mg_renderer_title_fsr"
|
||||
android:key="mg_renderer_setting_fsr"
|
||||
android:defaultValue="0"
|
||||
android:entries="@array/mg_renderer_names_fsr"
|
||||
android:entryValues="@array/mg_renderer_values_fsr"
|
||||
app2:useSimpleSummaryProvider="true"/>
|
||||
<androidx.preference.ListPreference
|
||||
android:title="@string/mg_renderer_title_errorSetting"
|
||||
android:key="mg_renderer_setting_errorSetting"
|
||||
@@ -54,6 +61,11 @@
|
||||
android:summary="@string/mg_renderer_summary_computeShaderext"
|
||||
android:key="mg_renderer_computeShaderext"
|
||||
android:defaultValue="false" />
|
||||
<SwitchPreference
|
||||
android:title="@string/mg_renderer_title_dsaExt"
|
||||
android:summary="@string/mg_renderer_summary_dsaExt"
|
||||
android:key="mg_renderer_dsaExt"
|
||||
android:defaultValue="false" />
|
||||
<SwitchPreference
|
||||
android:title="@string/mg_renderer_title_multidrawCompute"
|
||||
android:summary="@string/mg_renderer_summary_multidrawCompute"
|
||||
|
||||
Reference in New Issue
Block a user