Settings: Specify GPU resolution scale as VRAM size

This commit is contained in:
Albert Liu 2020-07-23 01:03:18 -07:00
parent e782b678b6
commit bf597aab44
3 changed files with 33 additions and 33 deletions

View File

@ -32,22 +32,22 @@
<item>Software</item>
</string-array>
<string-array name="settings_gpu_resolution_scale_entries">
<item>1x (1024x512)</item>
<item>2x (2048x1024)</item>
<item>3x (3072x1536)</item>
<item>4x (4096x2048)</item>
<item>5x (5120x2560)</item>
<item>6x (6144x3072)</item>
<item>7x (7168x3584)</item>
<item>8x (8192x4096)</item>
<item>9x (9216x4608)</item>
<item>10x (10240x5120)</item>
<item>11x (11264x5632)</item>
<item>12x (12288x6144)</item>
<item>13x (13312x6656)</item>
<item>14x (14336x7168)</item>
<item>15x (15360x7680)</item>
<item>16x (16384x8192)</item>
<item>1x (1024x512 VRAM)</item>
<item>2x (2048x1024 VRAM)</item>
<item>3x (3072x1536 VRAM)</item>
<item>4x (4096x2048 VRAM)</item>
<item>5x (5120x2560 VRAM)</item>
<item>6x (6144x3072 VRAM)</item>
<item>7x (7168x3584 VRAM)</item>
<item>8x (8192x4096 VRAM)</item>
<item>9x (9216x4608 VRAM)</item>
<item>10x (10240x5120 VRAM)</item>
<item>11x (11264x5632 VRAM)</item>
<item>12x (12288x6144 VRAM)</item>
<item>13x (13312x6656 VRAM)</item>
<item>14x (14336x7168 VRAM)</item>
<item>15x (15360x7680 VRAM)</item>
<item>16x (16384x8192 VRAM)</item>
</string-array>
<string-array name="settings_gpu_resolution_scale_values">
<item>1</item>

View File

@ -144,7 +144,7 @@ void GPUSettingsWidget::setupAdditionalUi()
m_ui.resolutionScale->addItem(tr("Automatic based on window size"));
for (u32 i = 1; i <= GPU::MAX_RESOLUTION_SCALE; i++)
m_ui.resolutionScale->addItem(tr("%1x (%2x%3)").arg(i).arg(GPU::VRAM_WIDTH * i).arg(GPU::VRAM_HEIGHT * i));
m_ui.resolutionScale->addItem(tr("%1x (%2x%3 VRAM)").arg(i).arg(GPU::VRAM_WIDTH * i).arg(GPU::VRAM_HEIGHT * i));
}
void GPUSettingsWidget::populateGPUAdapters()

View File

@ -1285,22 +1285,22 @@ void SDLHostInterface::DrawSettingsWindow()
ImGui::SameLine(indent);
static constexpr std::array<const char*, GPU::MAX_RESOLUTION_SCALE> resolutions = {{
"1x (1024x512)",
"2x (2048x1024)",
"3x (3072x1536)",
"4x (4096x2048)",
"5x (5120x2560)",
"6x (6144x3072)",
"7x (7168x3584)",
"8x (8192x4096)",
"9x (9216x4608)",
"10x (10240x5120)",
"11x (11264x5632)",
"12x (12288x6144)",
"13x (13312x6656)",
"14x (14336x7168)",
"15x (15360x7680)",
"16x (16384x8192)",
"1x (1024x512 VRAM)",
"2x (2048x1024 VRAM)",
"3x (3072x1536 VRAM)",
"4x (4096x2048 VRAM)",
"5x (5120x2560 VRAM)",
"6x (6144x3072 VRAM)",
"7x (7168x3584 VRAM)",
"8x (8192x4096 VRAM)",
"9x (9216x4608 VRAM)",
"10x (10240x5120 VRAM)",
"11x (11264x5632 VRAM)",
"12x (12288x6144 VRAM)",
"13x (13312x6656 VRAM)",
"14x (14336x7168 VRAM)",
"15x (15360x7680 VRAM)",
"16x (16384x8192 VRAM)",
}};
int current_resolution_index = static_cast<int>(m_settings_copy.gpu_resolution_scale) - 1;