diff options
| -rw-r--r-- | src/common/settings.cpp | 23 | ||||
| -rw-r--r-- | src/common/settings.h | 2 |
2 files changed, 7 insertions, 18 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6f3acee79..4b7fa4b82 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -109,51 +109,42 @@ void UpdateRescalingInfo() { | |||
| 109 | auto setup = values.resolution_setup.GetValue(); | 109 | auto setup = values.resolution_setup.GetValue(); |
| 110 | auto& info = values.resolution_info; | 110 | auto& info = values.resolution_info; |
| 111 | switch (setup) { | 111 | switch (setup) { |
| 112 | case ResolutionSetup::Res1_2X: { | 112 | case ResolutionSetup::Res1_2X: |
| 113 | info.up_scale = 1; | 113 | info.up_scale = 1; |
| 114 | info.down_shift = 1; | 114 | info.down_shift = 1; |
| 115 | break; | 115 | break; |
| 116 | } | 116 | case ResolutionSetup::Res3_4X: |
| 117 | case ResolutionSetup::Res3_4X: { | ||
| 118 | info.up_scale = 3; | 117 | info.up_scale = 3; |
| 119 | info.down_shift = 2; | 118 | info.down_shift = 2; |
| 120 | break; | 119 | break; |
| 121 | } | 120 | case ResolutionSetup::Res1X: |
| 122 | case ResolutionSetup::Res1X: { | ||
| 123 | info.up_scale = 1; | 121 | info.up_scale = 1; |
| 124 | info.down_shift = 0; | 122 | info.down_shift = 0; |
| 125 | break; | 123 | break; |
| 126 | } | ||
| 127 | case ResolutionSetup::Res3_2X: { | 124 | case ResolutionSetup::Res3_2X: { |
| 128 | info.up_scale = 3; | 125 | info.up_scale = 3; |
| 129 | info.down_shift = 1; | 126 | info.down_shift = 1; |
| 130 | break; | 127 | break; |
| 131 | } | 128 | } |
| 132 | case ResolutionSetup::Res2X: { | 129 | case ResolutionSetup::Res2X: |
| 133 | info.up_scale = 2; | 130 | info.up_scale = 2; |
| 134 | info.down_shift = 0; | 131 | info.down_shift = 0; |
| 135 | break; | 132 | break; |
| 136 | } | 133 | case ResolutionSetup::Res3X: |
| 137 | case ResolutionSetup::Res3X: { | ||
| 138 | info.up_scale = 3; | 134 | info.up_scale = 3; |
| 139 | info.down_shift = 0; | 135 | info.down_shift = 0; |
| 140 | break; | 136 | break; |
| 141 | } | 137 | case ResolutionSetup::Res4X: |
| 142 | case ResolutionSetup::Res4X: { | ||
| 143 | info.up_scale = 4; | 138 | info.up_scale = 4; |
| 144 | info.down_shift = 0; | 139 | info.down_shift = 0; |
| 145 | break; | 140 | break; |
| 146 | } | 141 | default: |
| 147 | default: { | ||
| 148 | UNREACHABLE(); | 142 | UNREACHABLE(); |
| 149 | info.up_scale = 1; | 143 | info.up_scale = 1; |
| 150 | info.down_shift = 0; | 144 | info.down_shift = 0; |
| 151 | } | 145 | } |
| 152 | } | ||
| 153 | info.up_factor = static_cast<f32>(info.up_scale) / (1U << info.down_shift); | 146 | info.up_factor = static_cast<f32>(info.up_scale) / (1U << info.down_shift); |
| 154 | info.down_factor = static_cast<f32>(1U << info.down_shift) / info.up_scale; | 147 | info.down_factor = static_cast<f32>(1U << info.down_shift) / info.up_scale; |
| 155 | info.size_up = info.up_scale * info.up_scale; | ||
| 156 | info.size_shift = info.down_shift * 2; | ||
| 157 | info.active = info.up_scale != 1 || info.down_shift != 0; | 148 | info.active = info.up_scale != 1 || info.down_shift != 0; |
| 158 | } | 149 | } |
| 159 | 150 | ||
diff --git a/src/common/settings.h b/src/common/settings.h index 2b11984b4..ca88c086b 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -67,8 +67,6 @@ struct ResolutionScalingInfo { | |||
| 67 | u32 down_shift{0}; | 67 | u32 down_shift{0}; |
| 68 | f32 up_factor{1.0f}; | 68 | f32 up_factor{1.0f}; |
| 69 | f32 down_factor{1.0f}; | 69 | f32 down_factor{1.0f}; |
| 70 | u32 size_up{1}; | ||
| 71 | u32 size_shift{0}; | ||
| 72 | bool active{}; | 70 | bool active{}; |
| 73 | }; | 71 | }; |
| 74 | 72 | ||