Merge pull request #5498 from iwubcode/hybrid_xfb

Hybrid xfb

1 files changed, 0 insertions, 61 deletions

diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp
index 26afc6c779..bba64ee7c1 100644
--- a/Source/Core/VideoBackends/Software/EfbCopy.cpp
+++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp
@@ -12,30 +12,8 @@
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/Fifo.h"
 
-static const float s_gammaLUT[] = {1.0f, 1.7f, 2.2f, 1.0f};
-
 namespace EfbCopy
 {
-static void CopyToXfb(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,
-                      float Gamma)
-{
-  DEBUG_LOG(VIDEO, "xfbaddr: %x, fbwidth: %i, fbheight: %i, source: (%i, %i, %i, %i), Gamma %f",
-            xfbAddr, fbWidth, fbHeight, sourceRc.top, sourceRc.left, sourceRc.bottom,
-            sourceRc.right, Gamma);
-
-  EfbInterface::yuv422_packed* xfb_in_ram =
-      (EfbInterface::yuv422_packed*)Memory::GetPointer(xfbAddr);
-
-  EfbInterface::CopyToXFB(xfb_in_ram, fbWidth, fbHeight, sourceRc, Gamma);
-}
-
-static void CopyToRam()
-{
-  u8* dest_ptr = Memory::GetPointer(bpmem.copyTexDest << 5);
-
-  TextureEncoder::Encode(dest_ptr);
-}
-
 void ClearEfb()
 {
   u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 |
@@ -55,43 +33,4 @@ void ClearEfb()
     }
   }
 }
-
-void CopyEfb()
-{
-  EFBRectangle rc;
-  rc.left = (int)bpmem.copyTexSrcXY.x;
-  rc.top = (int)bpmem.copyTexSrcXY.y;
-
-  // flipper represents the widths internally as last pixel minus starting pixel, so
-  // these are zero indexed.
-  rc.right = rc.left + (int)bpmem.copyTexSrcWH.x + 1;
-  rc.bottom = rc.top + (int)bpmem.copyTexSrcWH.y + 1;
-
-  if (bpmem.triggerEFBCopy.copy_to_xfb)
-  {
-    float yScale;
-    if (bpmem.triggerEFBCopy.scale_invert)
-      yScale = 256.0f / (float)bpmem.dispcopyyscale;
-    else
-      yScale = (float)bpmem.dispcopyyscale / 256.0f;
-
-    float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale);
-
-    if (yScale != 1.0)
-      WARN_LOG(VIDEO, "yScale of %f is currently unsupported", yScale);
-
-    if ((u32)xfbLines > MAX_XFB_HEIGHT)
-    {
-      INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines);
-      xfbLines = MAX_XFB_HEIGHT;
-    }
-
-    CopyToXfb(bpmem.copyTexDest << 5, bpmem.copyMipMapStrideChannels << 4, (u32)xfbLines, rc,
-              s_gammaLUT[bpmem.triggerEFBCopy.gamma]);
-  }
-  else
-  {
-    CopyToRam();  // FIXME: should use the rectangle we have already created above
-  }
-}
 }