Merge pull request #7406 from AdmiralCurtiss/xfb_rect_scale_from_ram

Correctly adjust the rendered XFB region at non-native internal resolutions when XFB was loaded from console RAM.

1 files changed, 10 insertions, 1 deletions

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index 25730f98f4..317f876aa7 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -676,7 +676,16 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const
       m_last_xfb_ticks = ticks;
 
       auto xfb_rect = texture_config.GetRect();
-      xfb_rect.right -= EFBToScaledX(fbStride - fbWidth);
+
+      // It's possible that the returned XFB texture is native resolution
+      // even when we're rendering at higher than native resolution
+      // if the XFB was was loaded entirely from console memory.
+      // If so, adjust the rectangle by native resolution instead of scaled resolution.
+      const u32 native_stride_width_difference = fbStride - fbWidth;
+      if (texture_config.width == xfb_entry->native_width)
+        xfb_rect.right -= native_stride_width_difference;
+      else
+        xfb_rect.right -= EFBToScaledX(native_stride_width_difference);
 
       m_last_xfb_region = xfb_rect;