From 31a55384b32990205c61f5ffb46484b2a2046d61 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 24 Dec 2014 23:06:44 +0100 Subject: [PATCH] VideoConfig: Rename "StereoMonoEFBDepth" to "StereoEFBMonoDepth" Makes a little bit more sense. --- Data/Sys/GameSettings/GLME01.ini | 2 +- Source/Core/VideoBackends/OGL/TextureCache.cpp | 2 +- Source/Core/VideoCommon/TextureCacheBase.cpp | 4 ++-- Source/Core/VideoCommon/TextureCacheBase.h | 2 +- Source/Core/VideoCommon/VideoConfig.cpp | 4 ++-- Source/Core/VideoCommon/VideoConfig.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Data/Sys/GameSettings/GLME01.ini b/Data/Sys/GameSettings/GLME01.ini index ccabdf2a10..d416b884e7 100644 --- a/Data/Sys/GameSettings/GLME01.ini +++ b/Data/Sys/GameSettings/GLME01.ini @@ -33,4 +33,4 @@ $99 of some treasures $End Boss Has No HP [Video_Stereoscopy] -StereoMonoEFBDepth = True +StereoEFBMonoDepth = True diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 97bc487675..0adb078cd5 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -421,7 +421,7 @@ void TextureCache::CompileShaders() "}\n" : nullptr; const char* prefix = (GProgram == nullptr) ? "f" : "v"; - const char* depth_layer = (g_ActiveConfig.bStereoMonoEFBDepth) ? "0.0" : "f_uv0.z"; + const char* depth_layer = (g_ActiveConfig.bStereoEFBMonoDepth) ? "0.0" : "f_uv0.z"; ProgramShaderCache::CompileShader(s_ColorMatrixProgram, StringFromFormat(VProgram, prefix, prefix).c_str(), pColorMatrixProg, GProgram); ProgramShaderCache::CompileShader(s_DepthMatrixProgram, StringFromFormat(VProgram, prefix, prefix).c_str(), StringFromFormat(pDepthMatrixProg, depth_layer).c_str(), GProgram); diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index e468dcca85..a005da3754 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -117,7 +117,7 @@ void TextureCache::OnConfigChanged(VideoConfig& config) } if ((config.iStereoMode > 0) != backup_config.s_stereo_3d || - config.bStereoMonoEFBDepth != backup_config.s_mono_efb_depth) + config.bStereoEFBMonoDepth != backup_config.s_efb_mono_depth) { g_texture_cache->DeleteShaders(); g_texture_cache->CompileShaders(); @@ -134,7 +134,7 @@ void TextureCache::OnConfigChanged(VideoConfig& config) backup_config.s_hires_textures = config.bHiresTextures; backup_config.s_copy_cache_enable = config.bEFBCopyCacheEnable; backup_config.s_stereo_3d = config.iStereoMode > 0; - backup_config.s_mono_efb_depth = config.bStereoMonoEFBDepth; + backup_config.s_efb_mono_depth = config.bStereoEFBMonoDepth; } void TextureCache::Cleanup() diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index d9cd2b8c16..c45894320c 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -146,7 +146,7 @@ private: bool s_hires_textures; bool s_copy_cache_enable; bool s_stereo_3d; - bool s_mono_efb_depth; + bool s_efb_mono_depth; } backup_config; }; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index a95cd30fbf..4b30d4025d 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -40,7 +40,7 @@ VideoConfig::VideoConfig() backend_info.bSupportsExclusiveFullscreen = false; // Game-specific stereoscopy settings - bStereoMonoEFBDepth = false; + bStereoEFBMonoDepth = false; iStereoDepthPercentage = 100; iStereoConvergencePercentage = 100; } @@ -189,7 +189,7 @@ void VideoConfig::GameIniLoad() CHECK_SETTING("Video_Enhancements", "StereoConvergence", iStereoConvergence); CHECK_SETTING("Video_Enhancements", "StereoSwapEyes", bStereoSwapEyes); - CHECK_SETTING("Video_Stereoscopy", "StereoMonoEFBDepth", bStereoMonoEFBDepth); + CHECK_SETTING("Video_Stereoscopy", "StereoEFBMonoDepth", bStereoEFBMonoDepth); CHECK_SETTING("Video_Stereoscopy", "StereoDepthPercentage", iStereoDepthPercentage); CHECK_SETTING("Video_Stereoscopy", "StereoConvergencePercentage", iStereoConvergencePercentage); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 88d5cd97af..83807538dc 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -126,7 +126,7 @@ struct VideoConfig final int iSaveTargetId; // TODO: Should be dropped // Stereoscopy - bool bStereoMonoEFBDepth; + bool bStereoEFBMonoDepth; int iStereoSeparationPercent; int iStereoConvergencePercent; int iStereoDepthPercentage;