diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-02-03 12:44:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 12:44:00 -0800 |
| commit | f65b3a998c457add6dc25e03bc49f6069b285684 (patch) | |
| tree | 4774bb8273c8a9a552e797aaacf3b4525352a967 /Source/Android/app/src/main/java | |
| parent | e05cc3f61d58646d264407b030be51b6beca3661 (diff) | |
| parent | 369a5d9963558d0fa5a6707658996b2a2baa4c30 (diff) | |
Merge pull request #7739 from zackhow/multib
Android: Disable backend multithreading and add option to gfx menu
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index b8e74f6c21..5aab54c95d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -452,6 +452,7 @@ public final class SettingsFragmentPresenter enhancementSection.getSetting(SettingsFile.KEY_ARBITRARY_MIPMAP_DETECTION); Setting wideScreenHack = gfxSection.getSetting(SettingsFile.KEY_WIDE_SCREEN_HACK); Setting force24BitColor = enhancementSection.getSetting(SettingsFile.KEY_FORCE_24_BIT_COLOR); + Setting backendMultithreading = gfxSection.getSetting(SettingsFile.KEY_BACKEND_MULTITHREADING); sl.add(new SingleChoiceSetting(SettingsFile.KEY_INTERNAL_RES, Settings.SECTION_GFX_SETTINGS, R.string.internal_resolution, R.string.internal_resolution_description, @@ -501,6 +502,10 @@ public final class SettingsFragmentPresenter sl.add(new CheckBoxSetting(SettingsFile.KEY_WIDE_SCREEN_HACK, Settings.SECTION_GFX_SETTINGS, R.string.wide_screen_hack, R.string.wide_screen_hack_description, false, wideScreenHack)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_BACKEND_MULTITHREADING, + Settings.SECTION_GFX_SETTINGS, + R.string.backend_multithreading, R.string.backend_multithreading_description, false, + backendMultithreading)); /* Check if we support stereo diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index df51a38e04..fd4734cd89 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -72,6 +72,7 @@ public final class SettingsFile public static final String KEY_ARBITRARY_MIPMAP_DETECTION = "ArbitraryMipmapDetection"; public static final String KEY_WIDE_SCREEN_HACK = "wideScreenHack"; public static final String KEY_FORCE_24_BIT_COLOR = "ForceTrueColor"; + public static final String KEY_BACKEND_MULTITHREADING = "BackendMultithreading"; public static final String KEY_STEREO_MODE = "StereoMode"; public static final String KEY_STEREO_DEPTH = "StereoDepth"; |