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/FramebufferManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp') 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); -- cgit v1.2.3