Merge pull request #7744 from stenzek/vsync

Renderer: Fix throttle-disable (TAB) hotkey when vsync is enabled

4 files changed, 7 insertions, 7 deletions

diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
index 333fd969f5..654cf17c95 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -601,7 +601,7 @@ void Present()
   // flag when it is supported, even when presenting in windowed mode.
   // However, this flag cannot be used if the app is in fullscreen mode as a
   // result of calling SetFullscreenState.
-  if (AllowTearingSupported() && !g_ActiveConfig.IsVSync() && !GetFullscreenState())
+  if (AllowTearingSupported() && !g_ActiveConfig.bVSyncActive && !GetFullscreenState())
     present_flags |= DXGI_PRESENT_ALLOW_TEARING;
 
   if (swapchain->IsTemporaryMonoSupported() && g_ActiveConfig.stereo_mode != StereoMode::QuadBuffer)
@@ -610,7 +610,7 @@ void Present()
   }
 
   // TODO: Is 1 the correct value for vsyncing?
-  swapchain->Present(static_cast<UINT>(g_ActiveConfig.IsVSync()), present_flags);
+  swapchain->Present(static_cast<UINT>(g_ActiveConfig.bVSyncActive), present_flags);
 }
 
 HRESULT SetFullscreenState(bool enable_fullscreen)
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 35ec1a6715..68e888f6bf 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -751,7 +751,7 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_
 
   // Handle VSync on/off
   if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC))
-    m_main_gl_context->SwapInterval(g_ActiveConfig.IsVSync());
+    m_main_gl_context->SwapInterval(g_ActiveConfig.bVSyncActive);
 
   // Because of the fixed framebuffer size we need to disable the resolution
   // options while running
@@ -1439,7 +1439,7 @@ void Renderer::OnConfigChanged(u32 bits)
   }
 
   if (bits & CONFIG_CHANGE_BIT_VSYNC && !DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC))
-    m_main_gl_context->SwapInterval(g_ActiveConfig.IsVSync());
+    m_main_gl_context->SwapInterval(g_ActiveConfig.bVSyncActive);
 
   if (bits & CONFIG_CHANGE_BIT_ANISOTROPY)
     g_sampler_cache->Clear();
diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
index dffe3fdd3c..9d1dc7ae88 100644
--- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
@@ -735,7 +735,7 @@ void Renderer::OnConfigChanged(u32 bits)
   if (m_swap_chain && bits & CONFIG_CHANGE_BIT_VSYNC)
   {
     g_command_buffer_mgr->WaitForGPUIdle();
-    m_swap_chain->SetVSync(g_ActiveConfig.IsVSync());
+    m_swap_chain->SetVSync(g_ActiveConfig.bVSyncActive);
   }
 
   // For quad-buffered stereo we need to change the layer count, so recreate the swap chain.
diff --git a/Source/Core/VideoBackends/Vulkan/main.cpp b/Source/Core/VideoBackends/Vulkan/main.cpp
index 53c04c4e37..b5eeb51da6 100644
--- a/Source/Core/VideoBackends/Vulkan/main.cpp
+++ b/Source/Core/VideoBackends/Vulkan/main.cpp
@@ -213,8 +213,8 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi)
   std::unique_ptr<SwapChain> swap_chain;
   if (surface != VK_NULL_HANDLE)
   {
-    swap_chain =
-        SwapChain::Create(wsi.display_connection, wsi.render_surface, surface, g_Config.IsVSync());
+    swap_chain = SwapChain::Create(wsi.display_connection, wsi.render_surface, surface,
+                                   g_ActiveConfig.bVSyncActive);
     if (!swap_chain)
     {
       PanicAlert("Failed to create Vulkan swap chain.");