Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU: Further refinements to crop overscan

Browse source 
Fixes flickering line in South Park.
This commit is contained in:
Connor McLaughlin 2020-05-17 19:23:46 +10:00
parent 0ef0c36704
commit 19cebd97da
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/gpu.cpp
View file

@ -505,36 +505,40 @@ void GPU::UpdateCRTCDisplayParameters()
// Determine if we need to adjust the VRAM rectangle (because the display is starting outside the visible area) or add // Determine if we need to adjust the VRAM rectangle (because the display is starting outside the visible area) or add
// padding. // padding.
u16 horizontal_skip_pixels;
if (horizontal_display_start >= cs.horizontal_active_start) if (horizontal_display_start >= cs.horizontal_active_start)
{ {
cs.display_origin_left = (horizontal_display_start - cs.horizontal_active_start) / cs.dot_clock_divider; cs.display_origin_left = (horizontal_display_start - cs.horizontal_active_start) / cs.dot_clock_divider;
cs.display_vram_left = m_crtc_state.regs.X; cs.display_vram_left = std::min<u16>(m_crtc_state.regs.X, VRAM_WIDTH - 1);
horizontal_skip_pixels = 0;
} }
else else
{ {
horizontal_skip_pixels = (cs.horizontal_active_start - horizontal_display_start) / cs.dot_clock_divider;
cs.display_origin_left = 0; cs.display_origin_left = 0;
cs.display_vram_left = std::min<u16>( cs.display_vram_left = std::min<u16>(m_crtc_state.regs.X + horizontal_skip_pixels, VRAM_WIDTH - 1);
m_crtc_state.regs.X + ((cs.horizontal_active_start - horizontal_display_start) / cs.dot_clock_divider),
VRAM_WIDTH - 1);
} }
u16 horizontal_active_ticks;
if (horizontal_display_end <= cs.horizontal_active_end) if (horizontal_display_end <= cs.horizontal_active_end)
{ {
const u16 active_ticks = horizontal_active_ticks =
horizontal_display_end - horizontal_display_end -
std::min(horizontal_display_end, std::max(horizontal_display_start, cs.horizontal_active_start)); std::min(horizontal_display_end, std::max(horizontal_display_start, cs.horizontal_active_start));
cs.display_vram_width = ((active_ticks / cs.dot_clock_divider) + 2u) & ~3u;
} }
else else
{ {
const u16 active_ticks = horizontal_active_ticks =
cs.horizontal_active_end - cs.horizontal_active_end -
std::min(cs.horizontal_active_end, std::max(horizontal_display_start, cs.horizontal_active_start)); std::min(cs.horizontal_active_end, std::max(horizontal_display_start, cs.horizontal_active_start));
cs.display_vram_width = ((active_ticks / cs.dot_clock_divider) + 2u) & ~3u;
} }
// align to 4-pixel boundary
cs.display_vram_width = ((horizontal_active_ticks / cs.dot_clock_divider) + 2u) & ~3u;
// apply the crop from the start (usually overscan)
cs.display_vram_width -= std::min(cs.display_vram_width, horizontal_skip_pixels);
if (vertical_display_start >= cs.vertical_active_start) if (vertical_display_start >= cs.vertical_active_start)
{ {
cs.display_origin_top = (vertical_display_start - cs.vertical_active_start) << height_shift; cs.display_origin_top = (vertical_display_start - cs.vertical_active_start) << height_shift;