diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-11-14 23:31:53 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-11-14 23:31:53 +0000 |
| commit | 0da42fcca7fb51966794608d51ee7cbb3bc7913b (patch) | |
| tree | e0320ce43b79faefe908b37caa6a9742218336dd /Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | |
| parent | 2378b443c109f2052c5608ddcbef9dc5d581bd70 (diff) | |
Merged some FramebufferManager code into VideoCommon.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6417 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 39cfe41144..0b2f7419dc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -273,8 +273,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB // Make sure to resolve anything we need to read from. const GLuint read_texture = bFromZBuffer ? - g_framebufferManager.ResolveAndGetDepthTarget(source_rect) : - g_framebufferManager.ResolveAndGetRenderTarget(source_rect); + FramebufferManager::ResolveAndGetDepthTarget(source_rect) : + FramebufferManager::ResolveAndGetRenderTarget(source_rect); // TODO: move const float xScale = Renderer::GetTargetScaleX(); @@ -287,7 +287,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB if (s_TempFramebuffer == 0) glGenFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); - g_framebufferManager.SetFramebuffer(s_TempFramebuffer); + FramebufferManager::SetFramebuffer(s_TempFramebuffer); // Bind texture to temporary framebuffer glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, texture, 0); GL_REPORT_FBO_ERROR(); @@ -334,7 +334,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB source_rect); } - g_framebufferManager.SetFramebuffer(0); + FramebufferManager::SetFramebuffer(0); VertexShaderManager::SetViewportChanged(); DisableStage(0); |