diff options
| author | degasus <wickmarkus@web.de> | 2015-10-29 08:45:17 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2015-11-15 11:59:52 +0100 |
| commit | 71b22702a1b65d024311d6a92069ab76a3b48c96 (patch) | |
| tree | cb2ce01c63c737e074186396d097062cd255e4f6 /Source/Core/VideoBackends/OGL/TextureCache.cpp | |
| parent | 495902787c74612c870547c21dbdb61bc53fecf8 (diff) | |
OGL-TextureConverter: Keep care about the global state ifself
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 287e9b2188..24fcb81e82 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -264,6 +264,9 @@ void TextureCache::TCacheEntry::FromRenderTarget(u8* dstPointer, unsigned int ds glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + FramebufferManager::SetFramebuffer(0); + g_renderer->RestoreAPIState(); + if (g_ActiveConfig.bSkipEFBCopyToRam) { this->Zero(dstPointer); @@ -277,16 +280,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(u8* dstPointer, unsigned int ds BytesPerRow(), NumBlocksY(), memory_stride, - read_texture, - srcFormat == PEControl::Z24, + srcFormat, isIntensity, scaleByHalf, srcRect); } - - FramebufferManager::SetFramebuffer(0); - - g_renderer->RestoreAPIState(); } TextureCache::TextureCache() |