history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-01 10:35:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #588 from ggrtk/gpu-crtc

Browse Source 
GPU: CRTC fixes
This commit is contained in:
Connor McLaughlin 2020-07-05 23:28:06 +10:00 committed by GitHub
commit 01a63a914a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/gpu.cpp
View File

@ -578,7 +578,7 @@ void GPU::UpdateCRTCDisplayParameters()
const u8 height_shift = m_force_progressive_scan ? y_shift : BoolToUInt8(m_GPUSTAT.vertical_interlace); const u8 height_shift = m_force_progressive_scan ? y_shift : BoolToUInt8(m_GPUSTAT.vertical_interlace);
// Determine screen size. // Determine screen size.
cs.display_width = (((cs.horizontal_active_end - cs.horizontal_active_start) / cs.dot_clock_divider) + 2u) & ~3u; cs.display_width = (cs.horizontal_active_end - cs.horizontal_active_start) / cs.dot_clock_divider;
cs.display_height = (cs.vertical_active_end - cs.vertical_active_start) << height_shift; cs.display_height = (cs.vertical_active_end - cs.vertical_active_start) << height_shift;
// 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
@ -612,7 +612,8 @@ void GPU::UpdateCRTCDisplayParameters()
} }
// align to 4-pixel boundary // align to 4-pixel boundary
cs.display_vram_width = ((horizontal_active_ticks / cs.dot_clock_divider) + 2u) & ~3u; cs.display_vram_width =
(static_cast<u16>(std::round(horizontal_active_ticks / static_cast<float>(cs.dot_clock_divider))) + 2u) & ~3u;
// apply the crop from the start (usually overscan) // apply the crop from the start (usually overscan)
cs.display_vram_width -= std::min(cs.display_vram_width, horizontal_skip_pixels); cs.display_vram_width -= std::min(cs.display_vram_width, horizontal_skip_pixels);
@ -1448,7 +1449,7 @@ void GPU::DrawDebugStateWindow()
ImGui::Text("Display origin: %u, %u", cs.display_origin_left, cs.display_origin_top); ImGui::Text("Display origin: %u, %u", cs.display_origin_left, cs.display_origin_top);
ImGui::Text("Active display: %ux%u @ (%u, %u)", cs.display_vram_width, cs.display_vram_height, cs.display_vram_left, ImGui::Text("Active display: %ux%u @ (%u, %u)", cs.display_vram_width, cs.display_vram_height, cs.display_vram_left,
cs.display_vram_top); cs.display_vram_top);
ImGui::Text("Padding: Left=%u, Top=%u, Right=%u, Bottom=%u", cs.display_origin_left, cs.display_origin_top, ImGui::Text("Padding: Left=%d, Top=%d, Right=%d, Bottom=%d", cs.display_origin_left, cs.display_origin_top,
cs.display_width - cs.display_vram_width - cs.display_origin_left, cs.display_width - cs.display_vram_width - cs.display_origin_left,
cs.display_height - cs.display_vram_height - cs.display_origin_top); cs.display_height - cs.display_vram_height - cs.display_origin_top);
} }