ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7398 from Techjar/emu-speed-skip-vsync 

VideoCommon: Skip vsync if configured emulation speed is not 100%
This commit is contained in:
Léo Lam 2018-09-16 15:19:45 +02:00 committed by GitHub
parent 80c402e1ad e9046f8eec
commit c49eb2d249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -8,6 +8,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/Config/GraphicsSettings.h" #include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/OnScreenDisplay.h"
@ -174,7 +175,8 @@ void VideoConfig::VerifyValidity()
bool VideoConfig::IsVSync() const bool VideoConfig::IsVSync() const
{ {
return bVSync && !Core::GetIsThrottlerTempDisabled(); return bVSync && !Core::GetIsThrottlerTempDisabled() &&
SConfig::GetInstance().m_EmulationSpeed == 1.0;
} }
bool VideoConfig::UsingUberShaders() const bool VideoConfig::UsingUberShaders() const