Skip to content

PS2 games in the browser: static recompilation to WebAssembly with a native runtime

C++

Crop the display by how far a game moves it below the video mode's first line

Samir Nurife115966b2f5
diff --git a/runtime/src/gs/gs.cpp b/runtime/src/gs/gs.cpp
index f110511..d26acc3 100644
--- a/runtime/src/gs/gs.cpp
+++ b/runtime/src/gs/gs.cpp
@@ -870,9 +870,12 @@ double gpu_busy_ms() {
#endif
}
-std::uint32_t shown_lines(std::uint32_t dh, std::uint64_t smode2) {
- const std::uint32_t lines = (ps2::g_options.pal ? 288u : 240u) * ((smode2 & 1u) ? 2u : 1u);
- return std::min(dh, lines);
+std::uint32_t shown_lines(std::uint32_t dh, std::uint32_t dy, std::uint64_t smode2) {
+ const std::uint32_t scale = (smode2 & 1u) ? 2u : 1u;
+ const std::uint32_t lines = (ps2::g_options.pal ? 288u : 240u) * scale;
+ const std::uint32_t top = (ps2::g_options.pal ? 36u : 25u) * scale, span = (ps2::g_options.pal ? 256u : 224u) * scale;
+ const std::uint32_t below = dy > top ? std::min(dy - top, span) : 0u;
+ return std::min({dh, lines, below ? span - below : lines});
}
DisplayRegs display_regs() { return DisplayRegs{g_pmode, g_smode2, {g_dispfb[0], g_dispfb[1]}, {g_display[0], g_display[1]}}; }
@@ -886,7 +889,7 @@ bool present(const DisplayRegs &r) {
if (circuit < 0) return true;
const std::uint64_t fb = r.dispfb[circuit], disp = r.display[circuit];
const std::uint32_t magh = (static_cast<std::uint32_t>(disp >> 23) & 0xFu) + 1, magv = (static_cast<std::uint32_t>(disp >> 27) & 3u) + 1;
- const std::uint32_t width = ((static_cast<std::uint32_t>(disp >> 32) & 0xFFFu) + 1) / magh, height = shown_lines((static_cast<std::uint32_t>(disp >> 44) & 0x7FFu) + 1, r.smode2) / magv;
+ const std::uint32_t width = ((static_cast<std::uint32_t>(disp >> 32) & 0xFFFu) + 1) / magh, height = shown_lines((static_cast<std::uint32_t>(disp >> 44) & 0x7FFu) + 1, static_cast<std::uint32_t>(disp >> 12) & 0x7FFu, r.smode2) / magv;
if (!width || !height || width > 2048 || height > 2048) return true;
const gpu::DisplaySource src{(static_cast<std::uint32_t>(fb) & 0x1FFu) * 32, static_cast<std::uint32_t>(fb >> 9) & 0x3Fu, static_cast<std::uint32_t>(fb >> 15) & 0x1Fu,
static_cast<std::uint32_t>(fb >> 32) & 0x7FFu, static_cast<std::uint32_t>(fb >> 43) & 0x7FFu, width, height, (r.smode2 & 3u) == 3u};
@@ -906,7 +909,7 @@ bool display(const DisplayRegs &r, std::vector<std::uint32_t> &rgba, std::uint32
const std::uint32_t psm = static_cast<std::uint32_t>(fb >> 15) & 0x1Fu;
const std::uint32_t dbx = static_cast<std::uint32_t>(fb >> 32) & 0x7FFu, dby = static_cast<std::uint32_t>(fb >> 43) & 0x7FFu;
const std::uint32_t magh = (static_cast<std::uint32_t>(disp >> 23) & 0xFu) + 1, magv = (static_cast<std::uint32_t>(disp >> 27) & 3u) + 1;
- const std::uint32_t dw = (static_cast<std::uint32_t>(disp >> 32) & 0xFFFu) + 1, dh = shown_lines((static_cast<std::uint32_t>(disp >> 44) & 0x7FFu) + 1, r.smode2);
+ const std::uint32_t dw = (static_cast<std::uint32_t>(disp >> 32) & 0xFFFu) + 1, dh = shown_lines((static_cast<std::uint32_t>(disp >> 44) & 0x7FFu) + 1, static_cast<std::uint32_t>(disp >> 12) & 0x7FFu, r.smode2);
width = dw / magh;
height = dh / magv;
if (!width || !height || width > 2048 || height > 2048) return false;