summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-12-29 12:00:51 +0100
committerJules Blok <jules.blok@gmail.com>2014-12-29 12:03:59 +0100
commitda058b3078b19e3d46ff28af18a76104e56cfe59 (patch)
tree73b8976d80f72ff037107350480c17e74dc151ea /Source/Core
parent813b3808a763daa48610c016efab3db68f1afd4f (diff)
VideoConfig: Fix convergence parameter.
Looks like a rebase failed somewhere.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoCommon/GeometryShaderManager.cpp2
-rw-r--r--Source/Core/VideoCommon/VideoConfig.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp
index c9bbd3c482..1d7d5ec029 100644
--- a/Source/Core/VideoCommon/GeometryShaderManager.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp
@@ -56,7 +56,7 @@ void GeometryShaderManager::SetConstants()
float offset = (g_ActiveConfig.iStereoDepth / 1000.0f) * (g_ActiveConfig.iStereoDepthPercentage / 100.0f);
constants.stereoparams[0] = g_ActiveConfig.bStereoSwapEyes ? offset : -offset;
constants.stereoparams[1] = g_ActiveConfig.bStereoSwapEyes ? -offset : offset;
- constants.stereoparams[2] = g_ActiveConfig.iStereoConvergence * (g_ActiveConfig.iStereoConvergencePercent / 100.0f);
+ constants.stereoparams[2] = g_ActiveConfig.iStereoConvergence * (g_ActiveConfig.iStereoConvergencePercentage / 100.0f);
}
else
{
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
index 83807538dc..d868ae5293 100644
--- a/Source/Core/VideoCommon/VideoConfig.h
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -127,8 +127,6 @@ struct VideoConfig final
// Stereoscopy
bool bStereoEFBMonoDepth;
- int iStereoSeparationPercent;
- int iStereoConvergencePercent;
int iStereoDepthPercentage;
int iStereoConvergencePercentage;