Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU: Fix GPUSTAT(31) during vblank

Browse source
This commit is contained in:
Connor McLaughlin 2019-10-15 22:36:10 +10:00
parent e68cddf017
commit 45bfcc8225
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/gpu.cpp
View file

@ -189,7 +189,7 @@ u32 GPU::ReadRegister(u32 offset)
{ {
// Bit 31 of GPUSTAT is always clear during vblank. // Bit 31 of GPUSTAT is always clear during vblank.
u32 bits = m_GPUSTAT.bits; u32 bits = m_GPUSTAT.bits;
bits &= ~(BoolToUInt32(!m_crtc_state.in_vblank) << 31); bits &= ~(BoolToUInt32(m_crtc_state.in_vblank) << 31);
return bits; return bits;
} }
@ -314,7 +314,8 @@ void GPU::UpdateCRTCConfig()
const u8 horizontal_resolution_index = m_GPUSTAT.horizontal_resolution_1 | (m_GPUSTAT.horizontal_resolution_2 << 2); const u8 horizontal_resolution_index = m_GPUSTAT.horizontal_resolution_1 | (m_GPUSTAT.horizontal_resolution_2 << 2);
cs.dot_clock_divider = dot_clock_dividers[horizontal_resolution_index]; cs.dot_clock_divider = dot_clock_dividers[horizontal_resolution_index];
cs.horizontal_resolution = horizontal_resolutions[horizontal_resolution_index]; cs.horizontal_resolution = horizontal_resolutions[horizontal_resolution_index];
cs.vertical_resolution = vertical_resolutions[m_GPUSTAT.vertical_resolution]; cs.vertical_resolution =
vertical_resolutions[BoolToUInt8(m_GPUSTAT.vertical_interlace && m_GPUSTAT.vertical_resolution)];
// check for a change in resolution // check for a change in resolution
const u32 old_horizontal_resolution = cs.visible_horizontal_resolution; const u32 old_horizontal_resolution = cs.visible_horizontal_resolution;
@ -385,7 +386,7 @@ void GPU::Execute(TickCount ticks)
m_system->IncrementFrameNumber(); m_system->IncrementFrameNumber();
m_crtc_state.current_scanline = 0; m_crtc_state.current_scanline = 0;
if (m_GPUSTAT.vertical_resolution) if (m_GPUSTAT.vertical_interlace & m_GPUSTAT.vertical_resolution)
m_GPUSTAT.drawing_even_line ^= true; m_GPUSTAT.drawing_even_line ^= true;
} }
@ -405,7 +406,7 @@ void GPU::Execute(TickCount ticks)
} }
// alternating even line bit in 240-line mode // alternating even line bit in 240-line mode
if (!m_crtc_state.vertical_resolution) if (!(m_GPUSTAT.vertical_interlace & m_GPUSTAT.vertical_resolution))
m_GPUSTAT.drawing_even_line = ConvertToBoolUnchecked(m_crtc_state.current_scanline & u32(1)); m_GPUSTAT.drawing_even_line = ConvertToBoolUnchecked(m_crtc_state.current_scanline & u32(1));
} }
@ -626,7 +627,7 @@ void GPU::WriteGP1(u32 value)
u32 bits; u32 bits;
BitField<u32, u8, 0, 2> horizontal_resolution_1; BitField<u32, u8, 0, 2> horizontal_resolution_1;
BitField<u32, u8, 2, 1> vertical_resolution; BitField<u32, bool, 2, 1> vertical_resolution;
BitField<u32, bool, 3, 1> pal_mode; BitField<u32, bool, 3, 1> pal_mode;
BitField<u32, bool, 4, 1> display_area_color_depth; BitField<u32, bool, 4, 1> display_area_color_depth;
BitField<u32, bool, 5, 1> vertical_interlace; BitField<u32, bool, 5, 1> vertical_interlace;

2
src/core/gpu.h
View file

@ -226,7 +226,7 @@ protected:
BitField<u32, bool, 15, 1> texture_disable; BitField<u32, bool, 15, 1> texture_disable;
BitField<u32, u8, 16, 1> horizontal_resolution_2; BitField<u32, u8, 16, 1> horizontal_resolution_2;
BitField<u32, u8, 17, 2> horizontal_resolution_1; BitField<u32, u8, 17, 2> horizontal_resolution_1;
BitField<u32, u8, 19, 1> vertical_resolution; BitField<u32, bool, 19, 1> vertical_resolution;
BitField<u32, bool, 20, 1> pal_mode; BitField<u32, bool, 20, 1> pal_mode;
BitField<u32, bool, 21, 1> display_area_color_depth_24; BitField<u32, bool, 21, 1> display_area_color_depth_24;
BitField<u32, bool, 22, 1> vertical_interlace; BitField<u32, bool, 22, 1> vertical_interlace;