From 2e28ed3291bc531ba5d0cd4057aa9cefdbf128be Mon Sep 17 00:00:00 2001 From: booto Date: Tue, 7 Jul 2015 21:09:25 +0800 Subject: Video: respect stride of efb copies to xfb --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 03cea928f0..85fa9a122c 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -159,10 +159,10 @@ FramebufferManager::~FramebufferManager() SAFE_RELEASE(m_efb.resolved_depth_tex); } -void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) +void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbStride, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) { u8* dst = Memory::GetPointer(xfbAddr); - s_xfbEncoder.Encode(dst, fbWidth, fbHeight, sourceRc, Gamma); + s_xfbEncoder.Encode(dst, fbStride, fbHeight, sourceRc, Gamma); } XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) -- cgit v1.2.3 From 9d055ba5f2a720778ce1f669e647266170650277 Mon Sep 17 00:00:00 2001 From: booto Date: Sun, 26 Jul 2015 00:59:00 +0800 Subject: Video: Trying to fix D3D/XFB disabled regression --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 85fa9a122c..6437d1feeb 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -162,7 +162,8 @@ FramebufferManager::~FramebufferManager() void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbStride, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) { u8* dst = Memory::GetPointer(xfbAddr); - s_xfbEncoder.Encode(dst, fbStride, fbHeight, sourceRc, Gamma); + // below div2 due to dx using pixel width + s_xfbEncoder.Encode(dst, fbStride/2, fbHeight, sourceRc, Gamma); } XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) -- cgit v1.2.3 From 0faba3b01806df0ea74e01257d3cc48ea5538771 Mon Sep 17 00:00:00 2001 From: mirrorbender Date: Mon, 20 Jul 2015 20:12:29 -0400 Subject: Changed the aspect ratio settings to account for NTSC/PAL pixel aspect ratios and VI scaling. --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 6437d1feeb..8921be9130 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -56,6 +56,14 @@ FramebufferManager::FramebufferManager() { m_target_width = Renderer::GetTargetWidth(); m_target_height = Renderer::GetTargetHeight(); + if(m_target_height < 1) + { + m_target_height = 1; + } + if(m_target_width < 1) + { + m_target_width = 1; + } DXGI_SAMPLE_DESC sample_desc = D3D::GetAAMode(g_ActiveConfig.iMultisampleMode); ID3D11Texture2D* buf; -- cgit v1.2.3 From 739ede22423d8ed755936fc140b3d0feddfaf800 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Jul 2015 19:48:08 -0600 Subject: Fix code to comply with coding style --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 8921be9130..f9f798f262 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -56,11 +56,11 @@ FramebufferManager::FramebufferManager() { m_target_width = Renderer::GetTargetWidth(); m_target_height = Renderer::GetTargetHeight(); - if(m_target_height < 1) + if (m_target_height < 1) { m_target_height = 1; } - if(m_target_width < 1) + if (m_target_width < 1) { m_target_width = 1; } -- cgit v1.2.3