diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-09-13 08:21:35 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-09-13 08:21:35 +0000 |
| commit | 700f2ff694a67b21272b81a7ca80ba5572e794d9 (patch) | |
| tree | 1b30e220aac51ed530d94bc110985cf3f90cba94 /Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | |
| parent | 52ea8a0fd10f6f4103befb091c1fdc20c2caf8f7 (diff) | |
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
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |