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/FramebufferManager.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/FramebufferManager.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 9aed4c6459..c237c71043 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -188,7 +188,7 @@ void FramebufferManager::Shutdown() void FramebufferManager::CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc) { - if (g_Config.bUseXFB) + if (g_ActiveConfig.bUseXFB) copyToRealXFB(xfbAddr, fbWidth, fbHeight, sourceRc); else copyToVirtualXFB(xfbAddr, fbWidth, fbHeight, sourceRc); @@ -196,7 +196,7 @@ void FramebufferManager::CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const const XFBSource* FramebufferManager::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight) { - if (g_Config.bUseXFB) + if (g_ActiveConfig.bUseXFB) return getRealXFBSource(xfbAddr, fbWidth, fbHeight); else return getVirtualXFBSource(xfbAddr, fbWidth, fbHeight); |