diff options
| author | JMC47 <JMC4789@gmail.com> | 2024-10-14 14:32:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 14:32:09 -0400 |
| commit | 9fcc195384597f129af8391ae6a175fc114a6725 (patch) | |
| tree | 38204e2fe41eed17a8a2a86b795840fe781cd893 /Source/Android/app/src | |
| parent | 8d5b6e8e8690b6c1470aa66d33aea3a7c1da24b3 (diff) | |
| parent | 564e640acf5324134216d6acda09230b4ef67862 (diff) | |
Merge pull request #13133 from JosJuice/android-vsync-setting
Android: Add vsync setting
Diffstat (limited to 'Source/Android/app/src')
4 files changed, 12 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt index 331ad7fa09..c83d1cc923 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt @@ -651,6 +651,7 @@ enum class BooleanSetting( SYSCONF_PROGRESSIVE_SCAN(Settings.FILE_SYSCONF, "IPL", "PGS", true), SYSCONF_PAL60(Settings.FILE_SYSCONF, "IPL", "E60", true), SYSCONF_WIIMOTE_MOTOR(Settings.FILE_SYSCONF, "BT", "MOT", true), + GFX_VSYNC(Settings.FILE_GFX, Settings.SECTION_GFX_HARDWARE, "VSync", false), GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack", false), GFX_CROP(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "Crop", false), GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS", false), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt index eedc1405ff..a971d7b709 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt @@ -124,6 +124,7 @@ class Settings : Closeable { const val SECTION_INI_DSP = "DSP" const val SECTION_LOGGER_LOGS = "Logs" const val SECTION_LOGGER_OPTIONS = "Options" + const val SECTION_GFX_HARDWARE = "Settings" const val SECTION_GFX_SETTINGS = "Settings" const val SECTION_GFX_ENHANCEMENTS = "Enhancements" const val SECTION_GFX_COLOR_CORRECTION = "ColorCorrection" diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index be04c4fca3..7404b396fa 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -1798,6 +1798,14 @@ class SettingsFragmentPresenter( sl.add( SwitchSetting( context, + BooleanSetting.GFX_VSYNC, + R.string.vsync, + R.string.vsync_description + ) + ) + sl.add( + SwitchSetting( + context, BooleanSetting.GFX_BACKEND_MULTITHREADING, R.string.backend_multithreading, R.string.backend_multithreading_description diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index a020887e0c..8d1f9db297 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -332,6 +332,8 @@ <string name="crop">Crop</string> <string name="crop_description">Crops the picture from its native aspect ratio to 4:3 or 16:9. If unsure, leave this unchecked.</string> <string name="progressive_scan">Enable Progressive Scan</string> + <string name="vsync">V-Sync</string> + <string name="vsync_description">This setting is unnecessary on most Android devices, because Android always enables V-Sync. If unsure, leave this unchecked.</string> <string name="backend_multithreading">Backend Multithreading</string> <string name="backend_multithreading_description">Enables graphics backend multithreading (Vulkan only). May affect performance. If unsure, leave this checked.</string> <string name="prefer_vs_for_point_line_expansion">Prefer VS for Point/Line Expansion</string> |