From 700f2ff694a67b21272b81a7ca80ba5572e794d9 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 13 Sep 2009 08:21:35 +0000 Subject: Lots of code and warning cleanup. OGL/D3D: Moved to a shared config class in VideoCommon. This lets VideoCommon code read the config without ugly hacks. Fixed various config race conditions by keeping a copy (g_ActiveConfig) of the g_Config struct which is updated once per frame. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4256 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp') diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp index 87099a88d3..93ebe767de 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp @@ -45,11 +45,11 @@ void ReloadShader() bool ApplyShader() { - if (s_currentShader != "User/Shaders/" + g_Config.sPostProcessingShader + ".txt") + if (s_currentShader != "User/Shaders/" + g_ActiveConfig.sPostProcessingShader + ".txt") { // Set immediately to prevent endless recompiles on failure. - if (!g_Config.sPostProcessingShader.empty()) - s_currentShader = "User/Shaders/" + g_Config.sPostProcessingShader + ".txt"; + if (!g_ActiveConfig.sPostProcessingShader.empty()) + s_currentShader = "User/Shaders/" + g_ActiveConfig.sPostProcessingShader + ".txt"; else s_currentShader.clear(); -- cgit v1.2.3