Skip to content

Land Tomba 2 widescreen cull work on master - #762

Merged
mstan merged 6 commits into
masterfrom
integrate/tomba2-resident-to-master-20261024
Oct 24, 2026
Merged

mstan merged 6 commits into
masterfrom
integrate/tomba2-resident-to-master-20261024

Conversation

@mstan

@mstan mstan commented Oct 24, 2026

Copy link
Copy Markdown
Member

Tomba 2 master pins f2a3b9be8 on perf/tomba2-resident-60fps-20261008, which never reached master. Current master rejects Tomba 2's game.toml (masked_reject needs aligned BNE reg,zero).

Ports the five widescreen commits that are missing from master (cherry-picked with -x):

  • packed screen-X predicates ([[widescreen.cull.packed_x]])
  • BLTZ GTE-flag masked_reject + 4:3 identity; legacy backdrop composites
  • explicit world axes for visibility cones
  • legacy overlay keys for default camera component order
  • thin terrain faces from zero integer NCLIP

The branch's guest_cycle_scale / batching commits are already on master (#561, #597, later revised), so they are not repeated. Fingerprints regenerated.

Conflicts were additive (master gained SXY cull + quality presets beside the same lines). The interpreter SLTU precedence is now packed-X → scale → keep → screen-X band, matching the code generator.

ctest: same 12 pre-existing failures as master, no new ones; new ws_cull codegen/interp tests pass.

🤖 Generated with Claude Code

@mstan
mstan marked this pull request as ready for review October 24, 2026 23:51
@mstan
mstan merged commit 9b41a1b into master Oct 24, 2026
1 check passed
mstan added a commit that referenced this pull request Oct 24, 2026
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant