Move to new Virtual XFB system which correctly handles games which store multiple XFB's in memory. More OpenGL cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3591 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/VideoCommon/Src/BPFunctions.h b/Source/Core/VideoCommon/Src/BPFunctions.h
index c3dd4ccc01..c22e9aa0b6 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.h
+++ b/Source/Core/VideoCommon/Src/BPFunctions.h
@@ -48,7 +48,7 @@ void SetColorMask(const Bypass &bp);
 float GetRendererTargetScaleX();

 float GetRendererTargetScaleY();

 void CopyEFB(const Bypass &bp, const TRectangle &rc, const u32 &address, const bool &fromZBuffer, const bool &isIntensityFmt, const u32 &copyfmt, const bool &scaleByHalf);

-void RenderToXFB(const Bypass &bp, const TRectangle &multirc, const float &yScale, const float &xfbLines, u8* pXFB, const u32 &dstWidth, const u32 &dstHeight);

+void RenderToXFB(const Bypass &bp, const TRectangle &multirc, const float &yScale, const float &xfbLines, u32 xfbAddr, const u32 &dstWidth, const u32 &dstHeight);

 void ClearScreen(const Bypass &bp, const TRectangle &multirc);

 void RestoreRenderState(const Bypass &bp);

 u8 *GetPointer(const u32 &address);

diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
index e0b0c9bca2..19540bfca3 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -220,7 +220,7 @@ void BPWritten(const Bypass& bp)
 				const float yScale = bpmem.dispcopyyscale / 256.0f;

 				const float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale);

 				RenderToXFB(bp, multirc, yScale, xfbLines, 

-									 Memory_GetPtr(bpmem.copyTexDest << 5), 

+									 bpmem.copyTexDest << 5, 

 									 bpmem.copyMipMapStrideChannels << 4, 

 									 (u32)ceil(xfbLines));

 			}