Skip to content

Merge Tombi EU integration branch into master - #757

Merged
mstan merged 11 commits into
masterfrom
integrate/tombi-eu-to-master-20261024
Oct 24, 2026
Merged

mstan merged 11 commits into
masterfrom
integrate/tombi-eu-to-master-20261024

Conversation

@mstan

@mstan mstan commented Oct 24, 2026

Copy link
Copy Markdown
Member

Brings integrate/tombi-eu-rc4-20261021 (PRs #738, #748) onto master. TombaRecomp master has pinned that side branch since v0.22.0.

Conflict resolutions (e3ddd8c):

  • mod_runtime.cpp: kept master's psx_sha256_file and shared feature_enable_impl/feature_set_option_impl; moved the EU HD-texture install checks into those so the in-game menu validates too.
  • main.cpp: one launcher VSync mapping (launcher_vsync.h) instead of master's inline copy plus the EU one.
  • gpu_gl_renderer.c: master's swap telemetry plus the EU swap-gap histogram.
  • gpu_exec_stubs.inc: master's fixture_wide_view; test_ws_view_anchor_gpu.c updated to it.
  • CMake/debug_server: both sides kept.

🤖 Generated with Claude Code

mstan and others added 10 commits October 19, 2026 15:33
Import the supplied developer handoff against 03e635e. Include regional capability controls, texture validation, SHA acceleration with portable fallback, SPU CD/XA correction, and overlay export/staging fixes. Validated with rebuilt EU runtime, guarded AOT audit and focused regressions.
…rc2-20261022

Route verified European discs to their matching native backend
…-disc-path-20261022

Preserve spaces in remembered regional disc paths
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…to-master-20261024

# Conflicts:
#	runtime/src/mod_runtime.cpp
@mstan
mstan marked this pull request as ready for review October 24, 2026 23:51
@mstan
mstan merged commit 48faa24 into master Oct 24, 2026
1 check failed
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.

2 participants