summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Vulkan
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2019-01-31 22:44:10 +0100
committerGitHub <noreply@github.com>2019-01-31 22:44:10 +0100
commitc1492aeb45e471cd37cd562f3fc87c27ab0fcd4c (patch)
tree5f46fc0539042a0b59323de07c7e944e1cf4f006 /Source/Core/VideoBackends/Vulkan
parent9c38772301101c4cd0f2a7912c9314ce6492cb62 (diff)
parentb01df8670fd9cf0571230ca7f0e19611e71256dd (diff)
Merge pull request #7744 from stenzek/vsync
Renderer: Fix throttle-disable (TAB) hotkey when vsync is enabled
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan')
-rw-r--r--Source/Core/VideoBackends/Vulkan/Renderer.cpp2
-rw-r--r--Source/Core/VideoBackends/Vulkan/main.cpp4
2 files changed, 3 insertions, 3 deletions
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.");