GPU: Fix 480i resolution display in OSD

stenzek · Dec 21, 2024 · ad980a7 · ad980a7
1 parent 0aa89ec
commit ad980a7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp
@@ -66,8 +66,7 @@ static TimingEvent s_command_tick_event(
   "GPU Command Tick", 1, 1, [](void* param, TickCount ticks, TickCount ticks_late) { g_gpu.CommandTickEvent(ticks); },
   nullptr);
 static TimingEvent s_frame_done_event(
-  "Frame Done", 1, 1, [](void* param, TickCount ticks, TickCount ticks_late) { g_gpu.FrameDoneEvent(ticks); },
-  nullptr);
+  "Frame Done", 1, 1, [](void* param, TickCount ticks, TickCount ticks_late) { g_gpu.FrameDoneEvent(ticks); }, nullptr);
 
 // #define PSX_GPU_STATS
 #ifdef PSX_GPU_STATS
@@ -160,8 +159,10 @@ std::tuple<u32, u32> GPU::GetFullDisplayResolution() const
                                              std::clamp<s32>(m_crtc_state.regs.X1, xmin, xmax),
                                            0) /
                              m_crtc_state.dot_clock_divider);
-    height = static_cast<u32>(std::max<s32>(
-      std::clamp<s32>(m_crtc_state.regs.Y2, ymin, ymax) - std::clamp<s32>(m_crtc_state.regs.Y1, ymin, ymax), 0));
+    height =
+      static_cast<u32>(std::max<s32>(
+        std::clamp<s32>(m_crtc_state.regs.Y2, ymin, ymax) - std::clamp<s32>(m_crtc_state.regs.Y1, ymin, ymax), 0))
+      << BoolToUInt8(m_GPUSTAT.vertical_interlace && m_GPUSTAT.vertical_resolution);
   }
 
   return std::tie(width, height);