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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.h') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index 592338e43c..208ec0a7f1 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -75,7 +75,7 @@ protected: static unsigned int m_EFBLayers; private: - virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height) = 0; + virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) = 0; // TODO: figure out why OGL is different for this guy virtual void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) = 0; -- 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.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.h') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index 208ec0a7f1..b8f1da0810 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -13,9 +13,6 @@ struct XFBSourceBase { virtual ~XFBSourceBase() {} - virtual void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc) const {}; - virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0; virtual void CopyEFB(float Gamma) = 0; @@ -27,7 +24,6 @@ struct XFBSourceBase unsigned int texWidth; unsigned int texHeight; - // TODO: only used by OGL TargetRectangle sourceRc; }; -- 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.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.h') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index b8f1da0810..5b97f1835d 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -48,8 +48,8 @@ public: static unsigned int LastXfbWidth() { return s_last_xfb_width; } static unsigned int LastXfbHeight() { return s_last_xfb_height; } - static int ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width); - static int ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height); + static int ScaleToVirtualXfbWidth(int x); + static int ScaleToVirtualXfbHeight(int y); static unsigned int GetEFBLayers() { return m_EFBLayers; } @@ -73,7 +73,7 @@ protected: private: virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) = 0; // TODO: figure out why OGL is different for this guy - virtual void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) = 0; + virtual void GetTargetSize(unsigned int *width, unsigned int *height) = 0; static VirtualXFBListType::iterator FindVirtualXFB(u32 xfbAddr, u32 width, u32 height); -- cgit v1.2.3 From af8ac328e5fb83266a55b2117925beed0a48e2f4 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Thu, 25 Dec 2014 02:37:22 +0100 Subject: Renderer: Use old method of calculating the source rectangle. --- Source/Core/VideoCommon/FramebufferManagerBase.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.h') diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index 5b97f1835d..661cfb7f31 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -24,6 +24,7 @@ struct XFBSourceBase unsigned int texWidth; unsigned int texHeight; + // TODO: only used by OGL TargetRectangle sourceRc; }; -- cgit v1.2.3