From dcdf8fd3ced5e5d2b94299bc710a69ee06bab0d6 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 29 Oct 2015 17:48:35 +0100
Subject: TextureCache: Split efb2ram from efb2tex

---
 Source/Core/VideoBackends/OGL/TextureCache.cpp | 34 ++++++++++++--------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')

diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp
index 24fcb81e82..e733cd8d87 100644
--- a/Source/Core/VideoBackends/OGL/TextureCache.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp
@@ -266,25 +266,23 @@ void TextureCache::TCacheEntry::FromRenderTarget(u8* dstPointer, unsigned int ds
 
 	FramebufferManager::SetFramebuffer(0);
 	g_renderer->RestoreAPIState();
+}
 
-	if (g_ActiveConfig.bSkipEFBCopyToRam)
-	{
-		this->Zero(dstPointer);
-	}
-	else
-	{
-		TextureConverter::EncodeToRamFromTexture(
-			dstPointer,
-			format,
-			native_width,
-			BytesPerRow(),
-			NumBlocksY(),
-			memory_stride,
-			srcFormat,
-			isIntensity,
-			scaleByHalf,
-			srcRect);
-	}
+void TextureCache::CopyEFB(u8* dst, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride,
+		PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+		bool isIntensity, bool scaleByHalf)
+{
+	TextureConverter::EncodeToRamFromTexture(
+		dst,
+		format,
+		native_width,
+		bytes_per_row,
+		num_blocks_y,
+		memory_stride,
+		srcFormat,
+		isIntensity,
+		scaleByHalf,
+		srcRect);
 }
 
 TextureCache::TextureCache()
-- 
cgit v1.2.3