diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp index 9815a09bb1..e76a56821f 100644 --- a/pcsx2/GS/GSState.cpp +++ b/pcsx2/GS/GSState.cpp @@ -377,7 +377,7 @@ GSVector4i GSState::GetFrameMagnifiedRect(int i) { GSVector4i rectangle = { 0, 0, 0, 0 }; - if (!IsEnabled(0) && !IsEnabled(1)) + if (!IsEnabled(i)) return rectangle; const int videomode = static_cast(GetVideoMode()) - 1; @@ -468,12 +468,16 @@ GSVector4i GSState::GetDisplayRect(int i) GSVector2i GSState::GetResolutionOffset(int i) { + GSVector2i offset = { 0, 0 }; + + if (!IsEnabled(i)) + return offset; + const int videomode = static_cast(GetVideoMode()) - 1; const auto& DISP = m_regs->DISP[i].DISPLAY; const auto& SMODE2 = m_regs->SMODE2; const int res_multi = (SMODE2.INT + 1); - GSVector2i offset; offset.x = (static_cast(DISP.DX) - VideoModeOffsets[videomode].z) / (VideoModeDividers[videomode].x + 1); offset.y = (static_cast(DISP.DY) - (VideoModeOffsets[videomode].w * ((IsAnalogue() && res_multi) ? res_multi : 1))) / (VideoModeDividers[videomode].y + 1); @@ -506,6 +510,16 @@ GSVector2i GSState::GetResolution() total_rect.w = std::min(total_rect.w, resolution.y); resolution.x = total_rect.z; resolution.y = total_rect.w; + + // When we're ignoring offsets we need to account for pictures which are usually offset up off the screen + // where more of the bottom would normally be visible, stops some games looking so cut off. + const int display_offset = std::min(GetResolutionOffset(0).y, GetResolutionOffset(1).y); + + // If there is a negative vertical offset on the picture, we need to read more. + if (display_offset < 0) + { + resolution.y += -display_offset; + } } return resolution; @@ -517,10 +531,13 @@ GSVector4i GSState::GetFrameRect(int i) if (i == -1) return GetFrameRect(0).runion(GetFrameRect(1)); - GSVector4i rectangle; + GSVector4i rectangle = { 0, 0, 0, 0 }; + + if (!IsEnabled(i)) + return rectangle; const auto& DISP = m_regs->DISP[i].DISPLAY; - + const u32 DW = DISP.DW + 1; const u32 DH = DISP.DH + 1; const GSVector2i magnification(DISP.MAGH+1, DISP.MAGV + 1); diff --git a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp index 4e2bc6a0f6..b9ec7591d3 100644 --- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp +++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp @@ -269,7 +269,14 @@ GSTexture* GSRendererHW::GetOutput(int i, int& y_offset) const int videomode = static_cast(GetVideoMode()) - 1; const int display_height = VideoModeOffsets[videomode].y * ((isinterlaced() && !m_regs->SMODE2.FFMD) ? 2 : 1); - const int fb_height = std::min(GetFramebufferHeight(), display_height) + DISPFB.DBY; + const int display_offset = GetResolutionOffset(i).y; + int fb_height = std::min(GetFramebufferHeight(), display_height) + DISPFB.DBY; + + // If there is a negative vertical offset on the picture, we need to read more. + if (display_offset < 0) + { + fb_height += -display_offset; + } // TRACE(_T("[%d] GetOutput %d %05x (%d)\n"), (int)m_perfmon.GetFrame(), i, (int)TEX0.TBP0, (int)TEX0.PSM); GSTexture* t = NULL; diff --git a/pcsx2/GS/Renderers/SW/GSRendererSW.cpp b/pcsx2/GS/Renderers/SW/GSRendererSW.cpp index 3ce1b43160..44dd4f3ce6 100644 --- a/pcsx2/GS/Renderers/SW/GSRendererSW.cpp +++ b/pcsx2/GS/Renderers/SW/GSRendererSW.cpp @@ -143,10 +143,15 @@ GSTexture* GSRendererSW::GetOutput(int i, int& y_offset) int w = DISPFB.FBW * 64; const int videomode = static_cast(GetVideoMode()) - 1; - int display_height = VideoModeOffsets[videomode].y * ((isinterlaced() && !m_regs->SMODE2.FFMD) ? 2 : 1); + const int display_offset = GetResolutionOffset(i).y; + const int display_height = VideoModeOffsets[videomode].y * ((isinterlaced() && !m_regs->SMODE2.FFMD) ? 2 : 1); int h = std::min(GetFramebufferHeight(), display_height) + DISPFB.DBY; - // TODO: round up bottom + // If there is a negative vertical offset on the picture, we need to read more. + if (display_offset < 0) + { + h += -display_offset; + } if (g_gs_device->ResizeTarget(&m_texture[i], w, h)) {