Add 90 FPS setting
This commit is contained in:
parent
b69285d510
commit
98484f75cd
|
|
@ -534,8 +534,8 @@
|
||||||
<item>@string/frame_pacing_mode_target_Auto</item>
|
<item>@string/frame_pacing_mode_target_Auto</item>
|
||||||
<item>@string/frame_pacing_mode_target_30</item>
|
<item>@string/frame_pacing_mode_target_30</item>
|
||||||
<item>@string/frame_pacing_mode_target_60</item>
|
<item>@string/frame_pacing_mode_target_60</item>
|
||||||
|
<item>@string/frame_pacing_mode_target_90</item>
|
||||||
<item>@string/frame_pacing_mode_target_120</item>
|
<item>@string/frame_pacing_mode_target_120</item>
|
||||||
<item>@string/frame_pacing_mode_target_240</item>
|
|
||||||
</string-array>
|
</string-array>
|
||||||
<integer-array name="framePacingModeValues">
|
<integer-array name="framePacingModeValues">
|
||||||
<item>0</item>
|
<item>0</item>
|
||||||
|
|
|
||||||
|
|
@ -1038,8 +1038,8 @@
|
||||||
<string name="frame_pacing_mode_target_Auto">Auto</string>
|
<string name="frame_pacing_mode_target_Auto">Auto</string>
|
||||||
<string name="frame_pacing_mode_target_30">30 FPS</string>
|
<string name="frame_pacing_mode_target_30">30 FPS</string>
|
||||||
<string name="frame_pacing_mode_target_60">60 FPS</string>
|
<string name="frame_pacing_mode_target_60">60 FPS</string>
|
||||||
|
<string name="frame_pacing_mode_target_90">90 FPS</string>
|
||||||
<string name="frame_pacing_mode_target_120">120 FPS</string>
|
<string name="frame_pacing_mode_target_120">120 FPS</string>
|
||||||
<string name="frame_pacing_mode_target_240">240 FPS</string>
|
|
||||||
|
|
||||||
<!-- ASTC Decoding Method Choices -->
|
<!-- ASTC Decoding Method Choices -->
|
||||||
<string name="accelerate_astc_cpu" translatable="false">CPU</string>
|
<string name="accelerate_astc_cpu" translatable="false">CPU</string>
|
||||||
|
|
|
||||||
|
|
@ -462,7 +462,7 @@ struct Values {
|
||||||
SwitchableSetting<FramePacingMode, true> frame_pacing_mode{linkage,
|
SwitchableSetting<FramePacingMode, true> frame_pacing_mode{linkage,
|
||||||
FramePacingMode::Target_Auto,
|
FramePacingMode::Target_Auto,
|
||||||
FramePacingMode::Target_Auto,
|
FramePacingMode::Target_Auto,
|
||||||
FramePacingMode::Target_240,
|
FramePacingMode::Target_120,
|
||||||
"frame_pacing_mode",
|
"frame_pacing_mode",
|
||||||
Category::RendererAdvanced,
|
Category::RendererAdvanced,
|
||||||
Specialization::Default,
|
Specialization::Default,
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt
|
||||||
ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16, X32, X64, None);
|
ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16, X32, X64, None);
|
||||||
ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
|
ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
|
||||||
ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
|
ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
|
||||||
ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_120, Target_240);
|
ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_90, Target_120);
|
||||||
ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed);
|
ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed);
|
||||||
ENUM(VramUsageMode, Conservative, Aggressive);
|
ENUM(VramUsageMode, Conservative, Aggressive);
|
||||||
ENUM(RendererBackend, OpenGL_GLSL, Vulkan, Null, OpenGL_GLASM, OpenGL_SPIRV);
|
ENUM(RendererBackend, OpenGL_GLSL, Vulkan, Null, OpenGL_GLASM, OpenGL_SPIRV);
|
||||||
|
|
|
||||||
|
|
@ -517,8 +517,8 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
|
||||||
PAIR(FramePacingMode, Target_Auto, tr("Auto")),
|
PAIR(FramePacingMode, Target_Auto, tr("Auto")),
|
||||||
PAIR(FramePacingMode, Target_30, tr("30 FPS")),
|
PAIR(FramePacingMode, Target_30, tr("30 FPS")),
|
||||||
PAIR(FramePacingMode, Target_60, tr("60 FPS")),
|
PAIR(FramePacingMode, Target_60, tr("60 FPS")),
|
||||||
|
PAIR(FramePacingMode, Target_90, tr("90 FPS")),
|
||||||
PAIR(FramePacingMode, Target_120, tr("120 FPS")),
|
PAIR(FramePacingMode, Target_120, tr("120 FPS")),
|
||||||
PAIR(FramePacingMode, Target_240, tr("240 FPS")),
|
|
||||||
}});
|
}});
|
||||||
translations->insert({Settings::EnumMetadata<Settings::VramUsageMode>::Index(),
|
translations->insert({Settings::EnumMetadata<Settings::VramUsageMode>::Index(),
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -204,12 +204,12 @@ bool Swapchain::AcquireNextImage() {
|
||||||
case Settings::FramePacingMode::Target_60:
|
case Settings::FramePacingMode::Target_60:
|
||||||
scheduler.Wait(resource_ticks[image_index], 60.0);
|
scheduler.Wait(resource_ticks[image_index], 60.0);
|
||||||
break;
|
break;
|
||||||
|
case Settings::FramePacingMode::Target_90:
|
||||||
|
scheduler.Wait(resource_ticks[image_index], 90.0);
|
||||||
|
break;
|
||||||
case Settings::FramePacingMode::Target_120:
|
case Settings::FramePacingMode::Target_120:
|
||||||
scheduler.Wait(resource_ticks[image_index], 120.0);
|
scheduler.Wait(resource_ticks[image_index], 120.0);
|
||||||
break;
|
break;
|
||||||
case Settings::FramePacingMode::Target_240:
|
|
||||||
scheduler.Wait(resource_ticks[image_index], 240.0);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resource_ticks[image_index] = scheduler.CurrentTick();
|
resource_ticks[image_index] = scheduler.CurrentTick();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue