mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-17 09:19:58 -04:00
Merge the pull request intake: fewer than six cores, a comma in the game folder's path, the pipeline cache's size check, video memory and commit handling, and smaller fixes.
The two sides both made the wait after a frame's first submission cover the write-backs under shadow storage; the rule is kept in one place, vk_sync_wb_split. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -160,6 +160,10 @@ beside the game.
|
||||
driver keeps the prepared shaders' libraries in that cache, and a smaller limit drops the oldest as new ones come in
|
||||
(a 2048 MB cache could not hold them): every start then builds them again in the background, and play stutters, with
|
||||
some things missing for a few frames, until that is done. The log's `library warm` lines say when this happens.
|
||||
- With 16 GB of RAM, give Windows a fixed page file of at least 32 GB (System, About, Advanced system settings,
|
||||
Performance Settings, Advanced, Virtual memory: Custom size, then restart). Windows counts the game's video memory
|
||||
against RAM plus page file, and a page file Windows sizes itself grows too slowly for Hyrule Field: the game then
|
||||
lets textures go and the ground can flash white or black. The log says `system commit low` when this happens.
|
||||
- **Screen** in the menu has Texture filtering (anisotropic, up to 16x, at once), Texture detail (Reduced and Low
|
||||
leave out the largest versions of the big surface textures so that the game fits the video memory of 6 and 8 GB
|
||||
cards; Automatic picks by the card), Upscaling (DLSS on NVIDIA RTX cards,
|
||||
|
||||
@@ -4,24 +4,27 @@ The runtime connects Ocarina's polling `nn::audio` input calls to SDL3's default
|
||||
microphone or audio interface as the operating system's default input and enable the game's microphone control.
|
||||
Both a hummed note and an instrument received by that input go through the game's own note recognition.
|
||||
|
||||
Audio capture opens when the game calls `OpenInputStream` and starts only on `StartInputStream`. The runtime does
|
||||
not write recordings to disk. SDL converts the input device's format to the requested PCM format and sample rate.
|
||||
At `OpenInputStream` the runtime checks that a default input exists and prepares a buffer. It opens the recording
|
||||
device at `StartInputStream` and releases it at stop or close. After a stop, the game can still read or purge the
|
||||
buffered frames and start capture again. Recordings stay in memory. SDL converts the input device's format to the
|
||||
requested PCM format and sample rate.
|
||||
The capture callback uses a bounded ring: unread overflow drops the oldest complete frames instead of retaining
|
||||
an unlimited recording while the game is paused. Stop, purge and close are distinct operations. Purging an unopened
|
||||
or failed stream is safe, including the null-stream path that previously crashed in `InputStreamImpl::Purge`.
|
||||
|
||||
This implements the non-event polling overload used by Ocarina 1.1.1. Event-based streams, per-device selection,
|
||||
hot-unplug recovery and packed 24-bit PCM are not implemented. Statistics return a neutral 24-byte structure.
|
||||
Unsupported formats and a denied or missing recording device return an input error rather than reporting a
|
||||
successfully opened stream. Input currently follows the operating system's default recording device; there is no
|
||||
new runtime menu setting.
|
||||
An unsupported format or missing default device returns an error at open. If the device disappears or access is
|
||||
denied when capture starts, start returns an input error and the game can retry. Input follows the operating system's
|
||||
default recording device; there is no new runtime menu setting.
|
||||
|
||||
## Validation
|
||||
|
||||
`python tests/audio_input_check.py --toolchain C:/msys64/ucrt64` builds and runs headless checks using SDL's dummy
|
||||
audio driver. They require no game files and do not open a physical microphone. They cover sample ordering across
|
||||
ring wrap and overflow, frame counts, start/stop, repeated open/close, purge, unsupported formats and purge/read
|
||||
after a failed open. On Linux, omit `--toolchain` and install SDL3's development package and pkg-config.
|
||||
audio driver. They require no game files or physical microphone. They check that idle streams leave the device
|
||||
closed, that a denied start can be retried, and that stopping one stream releases its device and preserves unread
|
||||
frames. They also cover ring wrap and overflow, frame counts, repeated open/close, unsupported formats and
|
||||
purge/read after a failed open. On Linux, omit `--toolchain` and install SDL3's development package and pkg-config.
|
||||
|
||||
A separate local real-device check received mono signed PCM16 at 48 kHz, verified the 4800-frame ring remained
|
||||
bounded, and opened and closed the device three times. In an Ocarina 1.1.1 Windows session built from the 0.5.0
|
||||
|
||||
@@ -362,6 +362,21 @@ A change to the button prompts (`tools/make_romfs_patches.py --prompts`, `tools/
|
||||
`.venv-py314\Scripts\python tests\romfs_prompts_test.py`, which runs the tool on a RomFS it makes itself (no game
|
||||
files); a change to the settings passes `nx2navi.exe --probe-cfg`.
|
||||
|
||||
A change to the action prompt's diamond of face buttons (`runtime/action_prompt.c`) or to the SARC and zstd dictionary
|
||||
helpers (`runtime/sarc.c`) passes `python tests\action_prompt_check.py`. It builds them alone, with the
|
||||
undefined-behaviour sanitizer, on a layout file, archives and dictionaries it makes from the format `action_prompt.c`'s
|
||||
header comment describes, and checks that:
|
||||
|
||||
- by label every place, cross, flip and bubble moves and no other byte, in every copy of the layout in the archive;
|
||||
- a second run changes nothing, and by label then by position gives the game's file back;
|
||||
- a file that is not the expected one is refused and left as it was: one value off, half laid out, one copy of four,
|
||||
damaged offsets, a pane record laid over the records that lead to another field, more than 16 copies, copies that
|
||||
share some of their bytes;
|
||||
- the packed file names the dictionary the original named, found by its id in the pack of dictionaries.
|
||||
|
||||
No game files. `--romfs <folder with romfs.bin and index.json>` also runs it on the game's own archive: four copies laid
|
||||
out, 208 fields, the same dictionary and unpacked size, and no byte changed outside the layout's copies.
|
||||
|
||||
A change to what the library warm logs when the driver's cache of stage libraries is cold (`runtime/vk_warm_hint.h`,
|
||||
`runtime/vk_pipeline.c` `lw_main`) passes `python tests\warm_hint_check.py`, which builds the header alone and checks
|
||||
the added text by GPU vendor and by why the cache was cold. No game files.
|
||||
|
||||
@@ -21,6 +21,22 @@ The log names the layout in effect (`input: gamepad layout ...`) and each gamepa
|
||||
(`input: gamepad "...": first press`); the menu shows the layout under *Automatic*. The game's prompts show the Switch
|
||||
letters unless *Button prompts* says otherwise (below).
|
||||
|
||||
The action prompt (top right) shows the four face buttons as a diamond. The game draws it in the Switch places (A right,
|
||||
B bottom, X top, Y left), which `nintendo` keeps. Under `xbox`, `playstation` and `auto` the diamond follows such a
|
||||
pad instead (A bottom, B right, X left, Y top), whatever *Button prompts* is.
|
||||
|
||||
The game reads the diamond once at start, before a gamepad is open:
|
||||
|
||||
- `auto` gets the Xbox diamond, so a Switch Pro Controller under `auto` sees A at the bottom although its A is on the
|
||||
right. Pick `nintendo` for that pad.
|
||||
- A change of layout shows after a restart; until then *Button prompts* says *prompts change after restart*.
|
||||
- A RomFS mod that changes the action prompt keeps its own diamond. A mod that replaces the same archive for other
|
||||
reasons gets the diamond moved on top of its changes.
|
||||
|
||||
The log says what happened in a line that starts with `action prompt:`. How the layout is changed:
|
||||
`runtime/action_prompt.c` (`DoCommand_00` in `UI/Layout2Archive/Common.Product.100.Nin_Ounce_NVN2.blarc.zs`, served
|
||||
from `<profile>/action-prompt/`).
|
||||
|
||||
## Button prompts
|
||||
|
||||
`NX2NAVI_PROMPTS` (`prompts`, the *Button prompts* row on the Controls tab) picks the buttons the game's prompts show: `nintendo` (default, the game's own), `xbox`, `playstation`, `steamdeck` or `pc` (*Keyboard and mouse*). It changes three things the game draws:
|
||||
|
||||
@@ -33,6 +33,13 @@ Draft notes for the release after 0.7.1. The version number is not decided yet.
|
||||
shader compiler"); with it each NaN test is now made on the bits of the number instead, which no compiler can drop.
|
||||
It is on by default only with that driver (`vk_nan_bits`); the first start after the update compiles the pipelines
|
||||
again. Untested on those cards before this release: please report whether the blocks are gone.
|
||||
- AMD RX 5000 and RX 6000 cards: the game no longer ends (code 71) when an enemy is killed. The Windows driver for
|
||||
these cards faults when it links a burst of new pipelines from shader libraries, which is what the first kill of a
|
||||
session asks for; players with an RX 6700 XT and an RX 5700 XT had it at every kill, and one of them found that
|
||||
`gpl = 0` stops it. That is now the default with this driver (the log reads "gpl no ... off by default on AMD's
|
||||
driver for RDNA 1 and 2"). The price: a pipeline the game needs for the first time is built whole while its draw
|
||||
waits, so a new area hitches more on these cards. `gpl = 1` in `nx2navi.ini` turns the libraries back on. A
|
||||
contributor's change, checked on their card; none of us has such a card.
|
||||
- The older installer's last step no longer writes `nx2navi.ini` again as a whole to set the language: it changes the
|
||||
`lang` line and keeps every other byte (it turned Windows line ends into Unix ones and dropped a byte order mark).
|
||||
|
||||
|
||||
Reference in New Issue
Block a user