From 0b9c8efa58b46cd07a9df69c7d59be59e8aba955 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 28 Mar 2024 07:30:09 +0100 Subject: [PATCH] Ignore vid_maxfps when vsync is enabled. Increase vid_maxfps to 500 as modern computers have monitors in the 240-500 hz range now. --- src/common/rendering/v_video.cpp | 2 +- src/common/rendering/vulkan/commands/vk_commandbuffer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/rendering/v_video.cpp b/src/common/rendering/v_video.cpp index 325aabb42..35a54e107 100644 --- a/src/common/rendering/v_video.cpp +++ b/src/common/rendering/v_video.cpp @@ -81,7 +81,7 @@ CUSTOM_CVAR(Int, gl_pipeline_depth, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N Printf("Changing the pipeline depth requires a restart for " GAMENAME ".\n"); } -CUSTOM_CVAR(Int, vid_maxfps, 200, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(Int, vid_maxfps, 500, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (self < GameTicRate && self != 0) { diff --git a/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp b/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp index 65348c3f8..a1657fc47 100644 --- a/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp +++ b/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp @@ -204,7 +204,8 @@ void VkCommandBufferManager::WaitForCommands(bool finish, bool uploadOnly) if (finish) { - fb->FPSLimit(); + if (!fb->GetVSync()) + fb->FPSLimit(); fb->GetFramebufferManager()->QueuePresent(); }