From 0da42fcca7fb51966794608d51ee7cbb3bc7913b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 14 Nov 2010 23:31:53 +0000 Subject: Merged some FramebufferManager code into VideoCommon. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6417 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp') diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 5a289e1895..7fecb82704 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -74,8 +74,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB bool bIsIntensityFmt, u32 copyfmt) { const LPDIRECT3DTEXTURE9 read_texture = bFromZBuffer ? - g_framebufferManager.GetEFBDepthTexture() : - g_framebufferManager.GetEFBColorTexture(); + FramebufferManager::GetEFBDepthTexture() : + FramebufferManager::GetEFBColorTexture(); if (!isDynamic || g_ActiveConfig.bCopyEFBToTexture) { @@ -128,7 +128,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); } - D3DFORMAT bformat = g_framebufferManager.GetEFBDepthRTSurfaceFormat(); + D3DFORMAT bformat = FramebufferManager::GetEFBDepthRTSurfaceFormat(); int SSAAMode = g_ActiveConfig.iMultisampleMode; D3D::drawShadedTexQuad(read_texture, &sourcerect, @@ -163,8 +163,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER); D3D::SetTexture(0, NULL); - D3D::dev->SetRenderTarget(0, g_framebufferManager.GetEFBColorRTSurface()); - D3D::dev->SetDepthStencilSurface(g_framebufferManager.GetEFBDepthRTSurface()); + D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface()); + D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface()); } TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, unsigned int height, -- cgit v1.2.3