From b109b31f6146acd84a4ab702e79e2b99c02b7a9c Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sat, 20 Dec 2014 17:24:35 +0100 Subject: FramebufferManagerBase: Only allocate one layer for Real XFB. --- Source/Core/VideoCommon/FramebufferManagerBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index e2a09c6527..b11bb97b6b 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -56,7 +56,7 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr } if (!m_realXFBSource) - m_realXFBSource = g_framebuffer_manager->CreateXFBSource(fbWidth, fbHeight); + m_realXFBSource = g_framebuffer_manager->CreateXFBSource(fbWidth, fbHeight, 1); m_realXFBSource->srcAddr = xfbAddr; @@ -158,7 +158,7 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe if (!vxfb->xfbSource) { - vxfb->xfbSource = g_framebuffer_manager->CreateXFBSource(target_width, target_height); + vxfb->xfbSource = g_framebuffer_manager->CreateXFBSource(target_width, target_height, m_EFBLayers); vxfb->xfbSource->texWidth = target_width; vxfb->xfbSource->texHeight = target_height; } -- cgit v1.2.3 From 4a86234a79f2ad2f72d17bb622669710aa1a37e8 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sat, 20 Dec 2014 18:20:49 +0100 Subject: D3D: Support stereoscopic XFB blit to screen. --- Source/Core/VideoCommon/FramebufferManagerBase.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index b11bb97b6b..83ad3a1ca4 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -66,7 +66,6 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr m_realXFBSource->texWidth = fbWidth; m_realXFBSource->texHeight = fbHeight; - // TODO: stuff only used by OGL... :/ // OpenGL texture coordinates originate at the lower left, which is why // sourceRc.top = fbHeight and sourceRc.bottom = 0. m_realXFBSource->sourceRc.left = 0; -- cgit v1.2.3 From 46bb4fd364ccd5e13c2cb13f1d8356526948337e Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Thu, 25 Dec 2014 00:58:16 +0100 Subject: FramebufferManagerBase: Remove obsolete parameters. --- Source/Core/VideoCommon/FramebufferManagerBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index 83ad3a1ca4..178a157f9a 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -146,7 +146,7 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe m_virtualXFBList.splice(m_virtualXFBList.begin(), m_virtualXFBList, vxfb); unsigned int target_width, target_height; - g_framebuffer_manager->GetTargetSize(&target_width, &target_height, sourceRc); + g_framebuffer_manager->GetTargetSize(&target_width, &target_height); // recreate if needed if (vxfb->xfbSource && (vxfb->xfbSource->texWidth != target_width || vxfb->xfbSource->texHeight != target_height)) @@ -233,7 +233,7 @@ void FramebufferManagerBase::ReplaceVirtualXFB() } } -int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width) +int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x) { if (g_ActiveConfig.RealXFBEnabled()) return x; @@ -241,7 +241,7 @@ int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffe return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth(); } -int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height) +int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y) { if (g_ActiveConfig.RealXFBEnabled()) return y; -- cgit v1.2.3