mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-25 18:05:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test: scale guards follow mirrors queued on the full-VRAM surface

Browse Source 
Native-wide mirrors now ride the window queue on the full-VRAM surface too
(wide_queue_live), share the queue tail (hiw_flush_tail) and scissor per
command; the guards check those forms.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Shokunin
2026-10-07 13:28:01 -07:00
parent ad8002e599
commit 8ff8528de9
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/tests/test_gl_internal_scale_guards.py
+13 -6
View File
@@ -132,8 +132,11 @@ class HiresWindowGuards(unittest.TestCase):
self.assertIn("if (!hiw_on()", body(GL, fn))
# an immediate write into the window lands after every queued draw
self.assertIn("hiw_flush_queue();", body(GL, fn))
# Queued when the window is on, or (full-VRAM surface) when a native-wide
# mirror can ride the queue (wide_queue_live).
for site in ("flush_tex_batch(void)", "flush_flat_batch(void)"):
self.assertIn("if (hiw_on() && hiw_enqueue_", body(GL, "static void " + site))
self.assertRegex(body(GL, "static void " + site),
r"if \(\(hiw_on\(\) \|\| \(mirror[^)]*wide_queue_live\(\)\)\) &&\s*hiw_enqueue_")
def test_wide_mirror_queued_in_windowed_mode(self):
# Windowed mode: a draw's native-wide mirror rides in its window queue
@@ -141,14 +144,16 @@ class HiresWindowGuards(unittest.TestCase):
# surface), not as a surface switch per batch. The immediate mirror
# runs only when the entry did not take it.
for site, call in (("static void flush_tex_batch(void)",
"if (hiw_on() && hiw_enqueue_tex(nverts, semi, mirror, s_tb_gate)) mirror = 0;"),
"hiw_enqueue_tex(nverts, semi, mirror, s_tb_gate)) mirror = 0;"),
("static void flush_flat_batch(void)",
"if (hiw_on() && hiw_enqueue_geo(s_fb, nverts, semi, mask, mirror, s_fb_gate)) mirror = 0;"),
"hiw_enqueue_geo(s_fb, nverts, semi, mask, mirror, s_fb_gate)) mirror = 0;"),
("static void gpu_geometry(", "mirror = 0;")):
fn = body(GL, site)
self.assertIn(call, fn, site)
self.assertLess(fn.index(call), fn.index("if (mirror) {"), site)
self.assertIn("wide_target_begin(", fn[fn.index("if (mirror) {"):], site)
# the immediate mirror is the last `if (mirror) {` (an earlier one
# notes the stencil the draw leaves behind)
self.assertLess(fn.index(call), fn.rindex("if (mirror) {"), site)
self.assertIn("wide_target_begin(", fn[fn.rindex("if (mirror) {"):], site)
ok = body(GL, "static int hiw_wide_queue_ok(int mirror)")
self.assertIn("return mirror && g_wide_cur && s_ws_ablate == 0;", ok)
for fn in ("static int hiw_enqueue_tex(", "static int hiw_enqueue_geo("):
@@ -156,12 +161,14 @@ class HiresWindowGuards(unittest.TestCase):
self.assertIn("if (!wq && !hiw_area_touches()) return 0;", b)
self.assertIn("if (wq) hiw_wide_set(c, gate);", b)
flush = body(GL, "static void hiw_flush_queue(void)")
if "hiw_flush_tail();" in flush: # shared with the native-wide-only queue
flush = body(GL, "static void hiw_flush_tail(void) {")
self.assertIn("hiw_replay_wide();", flush)
self.assertLess(flush.index("hiw_replay_wide();"), flush.index("hr_end();"))
replay = body(GL, "static void hiw_replay_wide(void)")
for need in ("if (!c->wfbo) continue;", "p_glBindFramebuffer(PSXGL_FRAMEBUFFER, c->wfbo);",
"glViewport(0, 0, g_wide_w * S, VRAM_H * S);",
"glScissor(0, sy * S, g_wide_w * S, sh * S);",
"glScissor(c->wsx * S, c->wsy * S, c->wsw * S, c->wsh * S);",
"p_glUniform1f(s_tex_uXoff, (float)c->wdx);",
"p_glUniform1f(s_geo_uXoff, (float)c->wdx);",
"tex_draw_passes_ex(c->vcount, c->semi, c->mask, c->check, 0);",