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

Merge pull request #13396 from jordan-woyak/vi-odd-even 

VideoInterface: Cleanup and minor fix in Update.
This commit is contained in:
JMC47 2025-03-10 15:05:12 -04:00 committed by GitHub
parent ff4486ee23 5ff2af9b6a
commit 203454a97a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -848,42 +848,49 @@ void VideoInterfaceManager::EndField(FieldType field, u64 ticks)
// Run when: When a frame is scanned (progressive/interlace) // Run when: When a frame is scanned (progressive/interlace)
void VideoInterfaceManager::Update(u64 ticks) void VideoInterfaceManager::Update(u64 ticks)
{ {
constexpr u32 odd_field_begin = 0;
// Even-field begins where the odd-field ends.
const u32 even_field_begin = GetHalfLinesPerOddField();
const bool is_at_field_boundary =
m_half_line_count == odd_field_begin || m_half_line_count == even_field_begin;
// Movie's frame counter should be updated before actually rendering the frame, // Movie's frame counter should be updated before actually rendering the frame,
// in case frame counter display is enabled // in case frame counter display is enabled
if (m_half_line_count == 0 || m_half_line_count == GetHalfLinesPerEvenField()) if (is_at_field_boundary)
m_system.GetMovie().FrameUpdate(); m_system.GetMovie().FrameUpdate();
// If this half-line is at some boundary of the "active video lines" in either field, we either // If this half-line is at some boundary of the "active video lines" in either field, we either
// need to (a) send a request to the GPU thread to actually render the XFB, or (b) increment // need to (a) send a request to the GPU thread to actually render the XFB, or (b) increment
// the number of frames we've actually drawn // the number of frames we've actually drawn
if (m_half_line_count == m_even_field_first_hl) if (m_half_line_count == m_odd_field_first_hl)
{
BeginField(FieldType::Even, ticks);
}
else if (m_half_line_count == m_odd_field_first_hl)
{ {
BeginField(FieldType::Odd, ticks); BeginField(FieldType::Odd, ticks);
} }
else if (m_half_line_count == m_even_field_last_hl) else if (m_half_line_count == m_even_field_first_hl)
{ {
EndField(FieldType::Even, ticks); BeginField(FieldType::Even, ticks);
} }
else if (m_half_line_count == m_odd_field_last_hl) else if (m_half_line_count == m_odd_field_last_hl)
{ {
EndField(FieldType::Odd, ticks); EndField(FieldType::Odd, ticks);
} }
else if (m_half_line_count == m_even_field_last_hl)
{
EndField(FieldType::Even, ticks);
}
// If this half-line is at a field boundary, deal with frame stepping before potentially // If this half-line is at a field boundary, deal with frame stepping before potentially
// dealing with SI polls, but after potentially sending a swap request to the GPU thread // dealing with SI polls, but after potentially sending a swap request to the GPU thread
if (m_half_line_count == 0 || m_half_line_count == GetHalfLinesPerEvenField()) if (is_at_field_boundary)
Core::Callback_NewField(m_system); Core::Callback_NewField(m_system);
// If an SI poll is scheduled to happen on this half-line, do it! // If an SI poll is scheduled to happen on this half-line, do it!
if (m_half_line_of_next_si_poll == m_half_line_count) if (m_half_line_count == m_half_line_of_next_si_poll)
{ {
Core::UpdateInputGate(!Config::Get(Config::MAIN_INPUT_BACKGROUND_INPUT), Core::UpdateInputGate(!Config::Get(Config::MAIN_INPUT_BACKGROUND_INPUT),
Config::Get(Config::MAIN_LOCK_CURSOR)); Config::Get(Config::MAIN_LOCK_CURSOR));
@ -895,19 +902,16 @@ void VideoInterfaceManager::Update(u64 ticks)
// If this half-line is at the actual boundary of either field, schedule an SI poll to happen // If this half-line is at the actual boundary of either field, schedule an SI poll to happen
// some number of half-lines in the future // some number of half-lines in the future
if (m_half_line_count == 0) if (is_at_field_boundary)
{ {
m_half_line_of_next_si_poll = NUM_HALF_LINES_FOR_SI_POLL; // first results start at vsync // first results start at vsync
} m_half_line_of_next_si_poll = m_half_line_count + NUM_HALF_LINES_FOR_SI_POLL;
if (m_half_line_count == GetHalfLinesPerEvenField())
{
m_half_line_of_next_si_poll = GetHalfLinesPerEvenField() + NUM_HALF_LINES_FOR_SI_POLL;
} }
// Move to the next half-line and potentially roll-over the count to zero. If we've reached // Move to the next half-line and potentially roll-over the count to zero. If we've reached
// the beginning of a new full-line, update the timer // the beginning of a new full-line, update the timer
m_half_line_count++; ++m_half_line_count;
if (m_half_line_count == GetHalfLinesPerEvenField() + GetHalfLinesPerOddField()) if (m_half_line_count == GetHalfLinesPerEvenField() + GetHalfLinesPerOddField())
{ {
m_half_line_count = 0; m_half_line_count = 0;