From 2528cf7c5416573fc8bf2e9316a3acc5a2395b79 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:22:37 -0400 Subject: [PATCH] settings: Enable FIFO relaxed Not entirely sure if we need this, but there's also no reason not to support it. settings: Give VSyncMode values --- src/common/settings.h | 11 ++++++----- src/core/telemetry_session.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 2371495e42..c0faa74068 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -17,9 +17,10 @@ namespace Settings { enum class VSyncMode : u32 { - Immediate, - FIFO, - Mailbox, + Immediate = 0, + Mailbox = 1, + FIFO = 2, + FIFORelaxed = 3, }; enum class RendererBackend : u32 { @@ -461,8 +462,8 @@ struct Values { SwitchableSetting nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; SwitchableSetting accelerate_astc{true, "accelerate_astc"}; SwitchableSetting async_astc{false, "async_astc"}; - Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, VSyncMode::Mailbox, - "use_vsync"}; + Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, + VSyncMode::FIFORelaxed, "use_vsync"}; SwitchableSetting shader_backend{ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV, "shader_backend"}; SwitchableSetting use_asynchronous_shaders{false, "use_asynchronous_shaders"}; diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 1e60478e20..7a2f3c90af 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -89,10 +89,12 @@ static constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) { switch (mode) { case Settings::VSyncMode::Immediate: return "Immediate"; - case Settings::VSyncMode::FIFO: - return "FIFO"; case Settings::VSyncMode::Mailbox: return "Mailbox"; + case Settings::VSyncMode::FIFO: + return "FIFO"; + case Settings::VSyncMode::FIFORelaxed: + return "FIFO Relaxed"; } return "Unknown"; }