ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Maintain framebuffer size when not using offsets 

This reduces blurriness
This commit is contained in:
refractionpcsx2 2022-04-13 15:36:44 +01:00
parent f28e42c4fe
commit 55d546b892
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pcsx2/GS/GSState.cpp
View File

@ -382,6 +382,7 @@ GSVector4i GSState::GetFrameMagnifiedRect(int i)
const GSVideoMode videomode = GetVideoMode(); const GSVideoMode videomode = GetVideoMode();
const auto& DISP = m_regs->DISP[i].DISPLAY; const auto& DISP = m_regs->DISP[i].DISPLAY;
const bool ignore_offset = !GSConfig.PCRTCOffsets;
const u32 DW = DISP.DW + 1; const u32 DW = DISP.DW + 1;
const u32 DH = DISP.DH + 1; const u32 DH = DISP.DH + 1;
@ -390,8 +391,18 @@ GSVector4i GSState::GetFrameMagnifiedRect(int i)
// but the size it's drawn to uses the default size of the display mode (for PAL/NTSC this is a MAGH of 3) // but the size it's drawn to uses the default size of the display mode (for PAL/NTSC this is a MAGH of 3)
// so for example a game will have a DW of 2559 and a MAGH of 4 to make it 512 (from the FB), but because it's drawing 2560 subpixels // so for example a game will have a DW of 2559 and a MAGH of 4 to make it 512 (from the FB), but because it's drawing 2560 subpixels
// it will cover the entire 640 wide of the screen (2560 / (3+1)). // it will cover the entire 640 wide of the screen (2560 / (3+1)).
const int width = (DW / (VideoModeDividers[(int)videomode - 1].x + 1)); int width;
const int height = (DH / (VideoModeDividers[(int)videomode - 1].y + 1)); int height;
if (ignore_offset)
{
width = (DW / (DISP.MAGH + 1));
height = (DH / (DISP.MAGV + 1));
}
else
{
width = (DW / (VideoModeDividers[(int)videomode - 1].x + 1));
height = (DH / (VideoModeDividers[(int)videomode - 1].y + 1));
}
const auto& SMODE2 = m_regs->SMODE2; const auto& SMODE2 = m_regs->SMODE2;
int res_multi = 1; int res_multi = 1;
@ -462,14 +473,23 @@ GSVector2i GSState::GetResolution()
const GSVideoMode videomode = GetVideoMode(); const GSVideoMode videomode = GetVideoMode();
const auto& SMODE2 = m_regs->SMODE2; const auto& SMODE2 = m_regs->SMODE2;
const int res_multi = (SMODE2.INT + 1); const int res_multi = (SMODE2.INT + 1);
const bool ignore_offset = !GSConfig.PCRTCOffsets;
GSVector2i resolution; GSVector2i resolution(VideoModeOffsets[(int)videomode - 1].x, VideoModeOffsets[(int)videomode - 1].y);
resolution.x = VideoModeOffsets[(int)videomode - 1].x; if (isinterlaced() && !m_regs->SMODE2.FFMD)
resolution.y = VideoModeOffsets[(int)videomode - 1].y; resolution.y *= 2;
if(!m_regs->SMODE2.FFMD) if (ignore_offset)
resolution.y *= ((IsAnalogue() && res_multi) ? res_multi : 1); {
GSVector4i total_rect = GetDisplayRect(0).runion(GetDisplayRect(1));
total_rect.z = total_rect.z - total_rect.x;
total_rect.w = total_rect.w - total_rect.y;
total_rect.z = std::min(total_rect.z, resolution.x);
total_rect.w = std::min(total_rect.w, resolution.y);
resolution.x = total_rect.z;
resolution.y = total_rect.w;
}
return resolution; return resolution;
} }

6
pcsx2/GS/Renderers/Common/GSRenderer.cpp
View File

@ -340,17 +340,17 @@ bool GSRenderer::Merge(int field)
off.y /= 2; off.y /= 2;
// src_gs_read is the size which we're really reading from GS memory. // src_gs_read is the size which we're really reading from GS memory.
src_gs_read[i] = (GSVector4(fr[i]) + GSVector4(0, y_offset[i], 0, y_offset[i])) * scale / GSVector4(tex[i]->GetSize()).xyxy(); src_gs_read[i] = ((GSVector4(fr[i]) + GSVector4(0, y_offset[i], 0, y_offset[i])) * scale) / GSVector4(tex[i]->GetSize()).xyxy();
// src_out_rect is the resized rect for output. // src_out_rect is the resized rect for output.
src_out_rect[i] = GSVector4(r) * scale / GSVector4(tex[i]->GetSize()).xyxy(); src_out_rect[i] = (GSVector4(r) * scale) / GSVector4(tex[i]->GetSize()).xyxy();
// dst is the final destination rect with offset on the screen. // dst is the final destination rect with offset on the screen.
dst[i] = scale * (GSVector4(off).xyxy() + GSVector4(r.rsize())); dst[i] = scale * (GSVector4(off).xyxy() + GSVector4(r.rsize()));
// Restore the single line offset for scanmsk. // Restore the single line offset for scanmsk.
if (m_scanmask_used && interlace_offset) if (m_scanmask_used && interlace_offset)
dst[i] -= GSVector4(0.0f, 1.0f, 0.0f, 1.0f); dst[i] += GSVector4(0.0f, 1.0f, 0.0f, 1.0f);
} }
if (feedback_merge && tex[2]) if (feedback_merge && tex[2])