diff options
| author | JosJuice <josjuice@gmail.com> | 2017-11-02 21:35:09 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-11-02 21:39:05 +0100 |
| commit | 2d3dd5ede73b698aad757f88d5ad95fd95a44918 (patch) | |
| tree | 1d971c250aeb63a2c73f99e3a1257fa82f1355af /Source/Android/app/src | |
| parent | e29cd19f731d11bfa8deefebfd2a867af4f2e348 (diff) | |
Revert "Convert to/from old EFB scale numbering"
This reverts commit 1fc910b3ea9eafcc3cc5132bdfc51731ba5fa9fd,
replacing the old INI setting EFBScale with a new INI setting
called InternalResolution, which has a simpler mapping:
| EFBScale | InternalResolution
----------------- | -------------------- | --------------------
Auto (fractional) | 0 |
Auto (integral) | 1 | 0
1x | 2 | 1
1.5x | 3 |
2x | 4 | 2
2.5x | 5 |
3x | 6 | 3
4x | 7 | 4
5x | 8 | 5
6x | 9 | 6
All the fractional IRs were removed in f090a943.
Diffstat (limited to 'Source/Android/app/src')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java | 2 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/values/arrays.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index dd4bbdfb66..4ad03c4509 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -82,7 +82,7 @@ public final class SettingsFile public static final String KEY_AUDIO_STRETCH = "AudioStretch"; public static final String KEY_SHOW_FPS = "ShowFPS"; - public static final String KEY_INTERNAL_RES = "EFBScale"; + public static final String KEY_INTERNAL_RES = "InternalResolution"; public static final String KEY_FSAA = "MSAA"; public static final String KEY_ANISOTROPY = "MaxAnisotropy"; public static final String KEY_POST_SHADER = "PostProcessingShader"; diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index aa5d87486e..ec9b2cf30f 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -111,12 +111,12 @@ <item>6x Native (3840x3168) for 4K</item> </string-array> <integer-array name="internalResolutionValues" translatable="false"> + <item>1</item> <item>2</item> + <item>3</item> <item>4</item> + <item>5</item> <item>6</item> - <item>7</item> - <item>8</item> - <item>9</item> </integer-array> <!-- FSAA Preference --> |