Revert "Convert to/from old EFB scale numbering"

This reverts commit 1fc910b3ea,
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.
This commit is contained in:
JosJuice
2017-11-02 21:35:09 +01:00
parent e29cd19f73
commit 2d3dd5ede7
8 changed files with 16 additions and 99 deletions

View File

@ -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";

View File

@ -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 -->