Repository navigation
Engine: bump the pin to 88c7e03f (Ocarina of Time on Switch 2 and more) - #813
Merged
Merged
Conversation
Moves .upstream-ref from 7249ee9f95ed to 88c7e03f51e3 and refreshes the patch queue. No patch landed upstream and none is dropped. 29 patch files are rewritten (new context and index lines). Eight conflicted and were resolved by hand: - 0001-runtime-profile: upstream makes the Mac's alias region the Switch's 64 GB (e9d71e27) and puts it last in the guest block. The alias and stack sizes still come from dm_profile(), the layout is upstream's. - 0003-ios-game-data-folder: DM_GUEST_FILE_DIR (865cc35f) is set in the per-game data setup. - 0008-bc-cpu-decode: the CPU decode branch sits before upstream's new linear-texture upload. - 0009-mac-keymap and 0053-runtime-profile-every-site: the run target of dm/host/tests/Makefile takes upstream's t_net_eventfd and our tests. - 0046-route-c-game-framework: the framework block sits after DM_GUEST_FILE_DIR in main.m. - 0053 also reads the new upstream sites through dm_profile(): app_pool in the guest-file check (865cc35f) and a draw_barriers key, with a check in t_profile_runtime and test_game_profile_runtime. - 0073 and 0081: a comment line and the DM_STEAM rows move to their new place. The pin changes the shader chain (DMSH_CHAIN 223f10d34f97 to adec7d81d970), so every game is rebuilt once, and the engine_id changes. GAMES.md gets the Kirby Air Riders gallery cell from the pin's table.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix or feature
Engine pin bump. It is not a launcher change.
What and why
I moved the engine pin from
7249ee9f95edto88c7e03f51e3, the head of seedds/nxnative main today. That is 28 upstream commits. @LNPANDY, this is the pin bump for the v1.2.2 release candidate. I did not merge it and I did not tag anything.What the pin brings, with the upstream commits:
b1d7c707). It holds 60 fps there and uses about 4 GB less memory on an external drive (6121fd75).8feddfee). Its gallery cell is in GAMES.md now.e9d71e27). A provisional profile's heap check keeps the alias region out of the heap (eab0aaac).865cc35f). New switches:DM_GUEST_FILE,DM_GUEST_FILE_CHUNK,DM_GUEST_FILE_DIR,DM_GUEST_FILE_MIN_FREE.a334797d). The SDK 22 audio update lock is found again (52190603).88c7e03f).st_dev(a2d39a26, by @lunks).zbicpackage before it extracts anything (99e32cea). A game with ZBIC modules used to stop only at the rewrite, after the whole RomFS was unpacked.16e3e24f). OCTOPATH TRAVELER II no longer stops its split at 11,832 of 13,980 shaders.6c55c3de) and its movie decoder thread (75c1a8cf), both by @sen-6ei. Axiom Verge's sky on iOS (a9d06b6f). Fire Emblem Fortune's Weave near=0 depth (d928699b). Breath of the Wild tile functions (0cefa868). Galaxy 2 cutscene crop (2202d610). Splatoon Raiders cube arrays (c83c48f2). Assassin's Creed Revelations event pool query (69cb9b6e, by @Fbenhaddou). Super Smash Bros. Ultimate update pages (a5c7234e). Unreal dynamic buffers keep 4 copies (6d269f93). A Pokemon Legends: Arceus capture demo workaround (dd6ce5ba).The shader chain moves from
223f10d34f97toadec7d81d970. Every game that was built with the old chain is rebuilt once (#449). Upstream's shader chain files are untouched by our patches.The pin changes the
engine_id. The new one is88c7e03f51e3934dc227089ea81ec64fcd525b03-5d39f3354ad8. A release candidate with this pin has to be tested as a whole, as RELEASING.md says. The engine thatengine-experimentalserves does not count for that test.Patches
No patch landed upstream and none is dropped. All 51 patches are kept. 29 patch files are rewritten because their context or index lines changed. Eight conflicted and I resolved them by hand without changing what they do:
0001-runtime-profile: the layout is upstream's new one (256 MB in front, heap, stacks, alias region last). The alias and stack sizes still come fromdm_profile().0003-ios-game-data-folder:DM_GUEST_FILE_DIRis set in the per-game data setup, as upstream does for the shared layout.0008-bc-cpu-decode: the CPU decode branch sits before upstream's new linear-texture upload.0009-mac-keymapand0053-runtime-profile-every-site: the run list ofdm/host/tests/Makefiletakes upstream'st_net_eventfdand our tests.0046-route-c-game-framework: the framework block follows the newDM_GUEST_FILE_DIRline inmain.m.0053reads the two new upstream sites through the runtime profile:app_poolin the guest-file check and adraw_barrierskey.t_profile_runtimeandtest_game_profile_runtimecheck the key.0073and0081: a comment line and theDM_STEAM_*rows moved to their new place.None of them touches the shader chain, and
python3 tools/engine.py checksays so.Checked
python3 tools/engine.py check: ok, 51 patches apply cleanly to88c7e03f51e3.tools/tests(patches, engine, release manifest, release notes, app version, l10n shell catalogs, launcher texts, bump candidates, nxbuild pin): 173 tests, all ok.make -C dm/host/tests run), ThreadSanitizer targets, thermal tests, texture tests, the CPU-only gfx tests andt_perf_order: all passed with the Wonder profile.DM_FRAMEWORK_BUILD: 265 files, 0 failed.dm/tools,dm/ios,dm/gfxtest files) with lz4, capstone, fonttools and zbic: all ok except two.test_dmsh_pool_arraysfails the same way on plain upstream88c7e03fwithout our patches.test_nsp_scanneedsdotnet, which is not on this Mac.swift testand it passed.gl-importsgfx target (_mh_execute_headeris undeclared with this local toolchain, in a file no patch touches),swift testof the iOS shell package and the app build. CI runs them.Screenshots
None, no visible change.
Scope
dm/,scripts/,docs/,ref/) is added to the repositoryUpstream-Statuslines are unchangedCHANGELOG.md,CHANGELOG.zh-CN.mdorrelease-notes/v1.2.2.md. docs: update v1.2.2 changelog and release notes for rc4 #811 edits them.