Permalink
Browse files

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

VideoCommon: Skip vsync if configured emulation speed is not 100%
  • Loading branch information...
leoetlino committed Sep 16, 2018
2 parents 80c402e + e9046f8 commit c49eb2d24975dcbbdb916e19bdb9c01068936884
Showing with 3 additions and 1 deletion.
  1. +3 −1 Source/Core/VideoCommon/VideoConfig.cpp
@@ -8,6 +8,7 @@
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
#include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Movie.h"
#include "VideoCommon/OnScreenDisplay.h"
@@ -174,7 +175,8 @@ void VideoConfig::VerifyValidity()
bool VideoConfig::IsVSync() const
{
return bVSync && !Core::GetIsThrottlerTempDisabled();
return bVSync && !Core::GetIsThrottlerTempDisabled() &&
SConfig::GetInstance().m_EmulationSpeed == 1.0;
}
bool VideoConfig::UsingUberShaders() const

0 comments on commit c49eb2d

Please sign in to comment.