WIP: fix(fps): the water ripples step every frame above 60 fps instead of jumping #1498

Draft
enum wants to merge 4 commits from enum/Longshot:fix/water-ripples-above-60 into main
Contributor

Type: fix · Risk: low · Tested on: Windows 11, RTX 4070 · Needs: Linux, any GPU

TL;DR

Above a 60 fps frame rate cap, the ripples in water jumped instead of spreading smoothly: in the Great Fairy fountains, Zora's Domain and wherever drops fall into water. The game moved the ripples in bursts, all at once on some frames and not at all on others. This PR spreads that movement over every frame, at the same overall speed. At the Hyrule Castle fountain at a 240 cap the ripples are smooth now, with frame generation off and at 2x; a new test fails on main and passes here.

Breakdown

  • Who it helps: anyone who plays with the Frame rate cap above 60 and walks or swims in water.
  • What was wrong: the water's ripple simulation runs a number of small steps per 1/60 s, and above 60 fps a frame ran all of them or none, so the rings stood still for a frame and then jumped.
  • What changes: above 60 fps every frame runs its share of those steps (2 or 3 of 4 at about 108 fps), still the same number a second as at 60.
  • What does not change: a cap of 60 (and 30) runs the game's own count, as before; the other counters the step patch covers; saves, settings and caches.
  • How it was checked: a game-free test (failing on main: 0 to 4 steps a frame at 108 fps); in the game at the fountain, main jumps and this PR is smooth, by eye and in a frame log (the water's frame-to-frame swing a median 0.155 on main, 0.052 here, over 3 interleaved runs each).
  • What is still open: a run on Linux (the host change is in host/nn_vi.c, which both platforms build; only Windows was built and run here).
  • Risk: low: one game site, the water renderer; at a cap of 60 it does what it did.

Why

With the Frame rate cap above 60, the water's ripple rings jump around when Link walks or swims in water and where drops land: in all the Great Fairy fountains, Zora's Domain and elsewhere. At a cap of 60 they are smooth. Frame generation isn't needed for it; the game's own frame rate above 60 is enough (reproduced at about 83, 99, 106 and 108 fps). Fixes #1199.

How to reproduce

Seen on: Windows 11 Pro (26300), NVIDIA GeForce RTX 4070, driver 616.56 (the report: RTX 5090, 621.24)
Settings and switches: Frame rate cap 240, frame generation off or 2x; otherwise defaults
Steps: stand in the water of a Great Fairy fountain (here Hyrule Castle's, as child) and walk a few steps
Expected: the ripples spread smoothly, as at a cap of 60
Actual: on main the rings stand still for a frame and then jump ahead

What changed

The water renderer (f_800672e0) runs (int)step × substeps ripple-simulation substeps a frame, the substeps a water object's +76. Above 60 fps the step is the frame's own time (0.56 at 108 fps), and the existing carry (WHOLE_SITES) handed out whole frames per water object: a frame got 0 frames (no substeps) or 1 (all of them). The site now carries the substeps instead: the fraction of step × substeps is kept per water object, and every frame runs its whole substeps.

  • host: frame_whole_times() in host/frame_whole.h (the carry of step × times; without the carry, the game's own (int)step × times), and its entry point hos_frame_whole_times() in host/nn_vi.c beside hos_frame_whole().
  • lift: in nx2/oot_patches.py, the water's WHOLE_SITES entry now includes the substeps' load, and WHOLE_TIMES names the register it multiplies by; whole_new() writes hos_frame_whole_times(...) and sets that register to 1, so the game's multiply that follows gives the substeps. patch_whole_frames() also takes a lift an earlier build patched with hos_frame_whole() (a work folder keeps its translation) to the new form.
  • tests: tests/test_water_substeps.py (new); tests/test_frame_whole.py expects the water's new form of the patched line.
  • docs: six runs in docs/tested/ (3 each, interleaved).

Measurements

Verdict: fixed: at the same spot and settings, the ripples jump on main and spread smoothly here, by eye and in the frame log; the water's frame-to-frame swing drops from a median 0.155 to 0.052, over 3 interleaved runs each.

Hardware: Windows 11 Pro 26300, NVIDIA GeForce RTX 4070, driver 616.56, AMD Ryzen 9 7900X, 63 GB
Scene: Hyrule Castle Great Fairy fountain, as child; 1280x720 window, default profile, Frame rate cap 240, frame generation off
Method: 3 runs each, interleaved (main, fix; then main, fix, main, fix), from the same dev base (main @ 310e7c9d, and this PR as a pack over it), from the same save: Link walks 0.7 s in the water and stands, then RX_VK_FRAMELOG records 2 s. The mean absolute change of the water beside Link (a 200x53 region of the 320x180 log, Link left out) between consecutive game frames. Falling particles and light on the water change every frame in both, so the water is never fully still; the ripples' steps show as alternating low and high frames. This is a correctness check, not a speed measurement. The first pair ran with the game-free suite beside it; the other four with nothing else running. Medians of the 3.
How to reproduce: the scene above, cap 240; RX_VK_FRAMELOG=<file> and <file>.go while recording; then compare consecutive frames of the water region.

Before: main @ 310e7c9d After: this PR @ 3eff1602
Ripples, cap 240, frame generation off (by eye) jump smooth
Ripples, cap 240, frame generation 2x (by eye) jump (on nightly-320, about 83 fps) smooth (about 87 fps)
Ripples, cap 60 (by eye) smooth (on nightly-320) not run (the game's own count, as main)
Game fps in the log (runs 1, 2, 3) 99, 105, 103 101, 106, 106
Water's change a frame: mean swing between neighbouring frames (runs 1, 2, 3) 0.134, 0.155, 0.164 0.052, 0.063, 0.050
Swing, median 0.155 0.052
Water's change a frame: spread, std / mean (runs 1, 2, 3) 18%, 19%, 21% 7%, 16%, 7%
Spread, median 19% 7%
Substeps a frame at 108 fps, 4 substeps (game-free test) 0 to 4 2 or 3

Rebased since onto main @ 9af4808f (this PR now @ 98b94d08); the numbers above still hold: the four commits are unchanged, and none of main's commits since 310e7c9d touches host/frame_whole.h, host/nn_vi.c, nx2/oot_patches.py or tests/test_frame_whole.py. After the rebase, python -I -B tests/run_all.py (Windows, llvm-mingw): 676 passed, 47 failed, 46 skipped, the 47 the same checks that fail on main @ 9af4808f.

The water's change a frame, the first 20 frames of run 1:

main: 0.66 0.89 0.98 0.62 0.89 0.58 0.87 0.97 0.56 0.82 0.56 0.81 0.88 0.58 0.79 0.57 0.82 0.95 0.56 0.90
fix:  0.66 0.71 0.69 0.75 0.67 0.68 0.64 0.72 0.64 0.75 0.75 0.68 0.73 0.73 0.62 0.75 0.68 0.75 0.68 0.73

The test on main (310e7c9d):

108 fps, 4 substeps: 0 to 4 a frame, 240 a second
FAIL line 46: lo >= 2 && hi <= 3
144 fps, 4 substeps: 0 to 4 a frame, 236 a second
FAIL line 50: lo >= 1 && hi <= 2
FAIL line 51: n >= 239 && n <= 240

and here: Ran 2 tests ... OK.

The water beside Link, the same 100 game frames of each log side by side, slowed to 25 a second (crop of the 320x180 frame log, scaled 2x):

Before: main @ 310e7c9d, After: this PR @ 3eff1602, the fountain at a 240 cap

Its first frame, for a reader whose viewer doesn't play GIFs:

Before: main @ 310e7c9d, After: this PR @ 3eff1602, first frame

Flags and settings

None.

Testing

Tested: my own runs on Windows 11 Pro 26300, RTX 4070, driver 616.56, at the Hyrule Castle Great Fairy fountain as child, cap 240: main @ 310e7c9d jumps; this PR @ 3eff1602 is smooth with frame generation off (about 106 fps) and at 2x (about 87 fps), the same base, save and settings. The pack's lift has hos_frame_whole_times at the water site, and the patcher printed no warning. Game-free: tests/test_water_substeps.py fails on main for the bug's reason and passes here, and it fails again with either half of the fix broken (WHOLE_TIMES emptied, or the multiply left out of frame_whole_times's no-carry path). python -I -B tests/run_all.py, Windows (llvm-mingw): 674 passed, 48 failed, 46 skipped; main @ 310e7c9d: 673 passed and the same 48 failed (the one more is the new test). Linux (WSL, gcc): 601 passed, 40 failed, 127 skipped; the same 40 fail on main there. Those failures are this PC's setup, not this change.

Not tested: a Linux game build and run (only Windows was built); Zora's Domain and the other places of the report (the fountain was the case reproduced); swimming.

Must be tested:

  • Linux, any GPU: build, stand in water at a Great Fairy fountain or in Zora's Domain at a Frame rate cap of 240, expecting the ripples to spread smoothly as at 60 (Test Farm: @Beanstalk linux, ripples at a fountain at a 240 cap)

Risks

What could break: the water's ripples above 60 fps, if a scene's water has a substep count where the carry behaves differently; at a cap of 60 or 30 the game's own count is kept.

Turning it off: revert the commit (a Frame rate cap of 60 also avoids the site's carry).

Compatibility: the game is translated again once (a lift patch changed); saves and settings are unchanged.

Issues

Fixes #1199

Checklist

Everyone

  • One topic.
  • The title is a Conventional Commit (type(scope): description) of the status line's type.
  • Why gives the reason plainly and links the issues that fit (the tracker searched).
  • Tested on my own PC where it runs (in the game, for a change the game runs), as Testing's Tested says; what
    can't be run by hand is in Testing's Not testable by hand, with why.
  • Measurements has a verdict, or one line saying why there is nothing to measure.
  • Nothing gets worse that I know of: any cost (speed, latency, memory, a setup that worked before) is measured and
    in Risks.
  • Testing names what was tested, what wasn't, and what must still be tested, where and how.
  • Rebased on current main.
  • python -I -B tests/run_all.py passes (any failure that also fails on main is named).
  • No game files, dumps, build output or generated files.
  • third_party/ untouched (a new folder with a PROVENANCE.md instead).
  • The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled.

When it applies

  • AI assistance recorded with Assisted-by: / Co-Authored-By: trailers.
  • Numbers from the same PC, scene and settings, at least 2 interleaved runs each, the median reported.
  • Screenshots of the same spot, captioned like the Measurements columns, for a change that shows on screen.
  • A file in docs/tested/ for each new measured run (format in docs/tested-configurations.md).
  • A game-free test added for the fix, failing on main and passing here.
  • A check under tests/ that reads changed source updated in this PR, not weakened.
  • Host code builds on both Windows (llvm-mingw) and Linux, with UTF-8 paths. (Built on Windows; Linux not built: Must be tested.)
  • Docs updated.

🤖 Generated with Claude Code

**Type:** fix · **Risk:** low · **Tested on:** Windows 11, RTX 4070 · **Needs:** Linux, any GPU ## TL;DR Above a 60 fps frame rate cap, the ripples in water jumped instead of spreading smoothly: in the Great Fairy fountains, Zora's Domain and wherever drops fall into water. The game moved the ripples in bursts, all at once on some frames and not at all on others. This PR spreads that movement over every frame, at the same overall speed. At the Hyrule Castle fountain at a 240 cap the ripples are smooth now, with frame generation off and at 2x; a new test fails on main and passes here. ## Breakdown - **Who it helps:** anyone who plays with the Frame rate cap above 60 and walks or swims in water. - **What was wrong:** the water's ripple simulation runs a number of small steps per 1/60 s, and above 60 fps a frame ran all of them or none, so the rings stood still for a frame and then jumped. - **What changes:** above 60 fps every frame runs its share of those steps (2 or 3 of 4 at about 108 fps), still the same number a second as at 60. - **What does not change:** a cap of 60 (and 30) runs the game's own count, as before; the other counters the step patch covers; saves, settings and caches. - **How it was checked:** a game-free test (failing on main: 0 to 4 steps a frame at 108 fps); in the game at the fountain, main jumps and this PR is smooth, by eye and in a frame log (the water's frame-to-frame swing a median 0.155 on main, 0.052 here, over 3 interleaved runs each). - **What is still open:** a run on Linux (the host change is in `host/nn_vi.c`, which both platforms build; only Windows was built and run here). - **Risk:** low: one game site, the water renderer; at a cap of 60 it does what it did. ## Why With the Frame rate cap above 60, the water's ripple rings jump around when Link walks or swims in water and where drops land: in all the Great Fairy fountains, Zora's Domain and elsewhere. At a cap of 60 they are smooth. Frame generation isn't needed for it; the game's own frame rate above 60 is enough (reproduced at about 83, 99, 106 and 108 fps). Fixes #1199. ## How to reproduce **Seen on:** Windows 11 Pro (26300), NVIDIA GeForce RTX 4070, driver 616.56 (the report: RTX 5090, 621.24) **Settings and switches:** Frame rate cap 240, frame generation off or 2x; otherwise defaults **Steps:** stand in the water of a Great Fairy fountain (here Hyrule Castle's, as child) and walk a few steps **Expected:** the ripples spread smoothly, as at a cap of 60 **Actual:** on main the rings stand still for a frame and then jump ahead ## What changed The water renderer (`f_800672e0`) runs `(int)step × substeps` ripple-simulation substeps a frame, the substeps a water object's `+76`. Above 60 fps the step is the frame's own time (0.56 at 108 fps), and the existing carry (`WHOLE_SITES`) handed out whole frames per water object: a frame got 0 frames (no substeps) or 1 (all of them). The site now carries the substeps instead: the fraction of `step × substeps` is kept per water object, and every frame runs its whole substeps. - host: `frame_whole_times()` in `host/frame_whole.h` (the carry of `step × times`; without the carry, the game's own `(int)step × times`), and its entry point `hos_frame_whole_times()` in `host/nn_vi.c` beside `hos_frame_whole()`. - lift: in `nx2/oot_patches.py`, the water's `WHOLE_SITES` entry now includes the substeps' load, and `WHOLE_TIMES` names the register it multiplies by; `whole_new()` writes `hos_frame_whole_times(...)` and sets that register to 1, so the game's multiply that follows gives the substeps. `patch_whole_frames()` also takes a lift an earlier build patched with `hos_frame_whole()` (a work folder keeps its translation) to the new form. - tests: `tests/test_water_substeps.py` (new); `tests/test_frame_whole.py` expects the water's new form of the patched line. - docs: six runs in `docs/tested/` (3 each, interleaved). ## Measurements **Verdict:** fixed: at the same spot and settings, the ripples jump on main and spread smoothly here, by eye and in the frame log; the water's frame-to-frame swing drops from a median 0.155 to 0.052, over 3 interleaved runs each. Hardware: Windows 11 Pro 26300, NVIDIA GeForce RTX 4070, driver 616.56, AMD Ryzen 9 7900X, 63 GB Scene: Hyrule Castle Great Fairy fountain, as child; 1280x720 window, default profile, Frame rate cap 240, frame generation off Method: 3 runs each, interleaved (main, fix; then main, fix, main, fix), from the same dev base (main @ 310e7c9d, and this PR as a pack over it), from the same save: Link walks 0.7 s in the water and stands, then `RX_VK_FRAMELOG` records 2 s. The mean absolute change of the water beside Link (a 200x53 region of the 320x180 log, Link left out) between consecutive game frames. Falling particles and light on the water change every frame in both, so the water is never fully still; the ripples' steps show as alternating low and high frames. This is a correctness check, not a speed measurement. The first pair ran with the game-free suite beside it; the other four with nothing else running. Medians of the 3. How to reproduce: the scene above, cap 240; `RX_VK_FRAMELOG=<file>` and `<file>.go` while recording; then compare consecutive frames of the water region. | | Before: main @ 310e7c9d | After: this PR @ 3eff1602 | |---|---|---| | Ripples, cap 240, frame generation off (by eye) | jump | smooth | | Ripples, cap 240, frame generation 2x (by eye) | jump (on nightly-320, about 83 fps) | smooth (about 87 fps) | | Ripples, cap 60 (by eye) | smooth (on nightly-320) | not run (the game's own count, as main) | | Game fps in the log (runs 1, 2, 3) | 99, 105, 103 | 101, 106, 106 | | Water's change a frame: mean swing between neighbouring frames (runs 1, 2, 3) | 0.134, 0.155, 0.164 | 0.052, 0.063, 0.050 | | **Swing, median** | **0.155** | **0.052** | | Water's change a frame: spread, std / mean (runs 1, 2, 3) | 18%, 19%, 21% | 7%, 16%, 7% | | **Spread, median** | **19%** | **7%** | | Substeps a frame at 108 fps, 4 substeps (game-free test) | 0 to 4 | 2 or 3 | Rebased since onto main @ 9af4808f (this PR now @ 98b94d08); the numbers above still hold: the four commits are unchanged, and none of main's commits since 310e7c9d touches `host/frame_whole.h`, `host/nn_vi.c`, `nx2/oot_patches.py` or `tests/test_frame_whole.py`. After the rebase, `python -I -B tests/run_all.py` (Windows, llvm-mingw): 676 passed, 47 failed, 46 skipped, the 47 the same checks that fail on main @ 9af4808f. The water's change a frame, the first 20 frames of run 1: ``` main: 0.66 0.89 0.98 0.62 0.89 0.58 0.87 0.97 0.56 0.82 0.56 0.81 0.88 0.58 0.79 0.57 0.82 0.95 0.56 0.90 fix: 0.66 0.71 0.69 0.75 0.67 0.68 0.64 0.72 0.64 0.75 0.75 0.68 0.73 0.73 0.62 0.75 0.68 0.75 0.68 0.73 ``` The test on main (310e7c9d): ``` 108 fps, 4 substeps: 0 to 4 a frame, 240 a second FAIL line 46: lo >= 2 && hi <= 3 144 fps, 4 substeps: 0 to 4 a frame, 236 a second FAIL line 50: lo >= 1 && hi <= 2 FAIL line 51: n >= 239 && n <= 240 ``` and here: `Ran 2 tests ... OK`. The water beside Link, the same 100 game frames of each log side by side, slowed to 25 a second (crop of the 320x180 frame log, scaled 2x): ![Before: main @ 310e7c9d, After: this PR @ 3eff1602, the fountain at a 240 cap](https://git.magicbean.dev/attachments/854c1501-5a82-4720-948a-6911b56382e1) Its first frame, for a reader whose viewer doesn't play GIFs: ![Before: main @ 310e7c9d, After: this PR @ 3eff1602, first frame](https://git.magicbean.dev/attachments/929a9524-80fb-4a8e-b7b0-67b31ae945e4) ### Flags and settings None. ## Testing **Tested:** my own runs on Windows 11 Pro 26300, RTX 4070, driver 616.56, at the Hyrule Castle Great Fairy fountain as child, cap 240: main @ 310e7c9d jumps; this PR @ 3eff1602 is smooth with frame generation off (about 106 fps) and at 2x (about 87 fps), the same base, save and settings. The pack's lift has `hos_frame_whole_times` at the water site, and the patcher printed no warning. Game-free: `tests/test_water_substeps.py` fails on main for the bug's reason and passes here, and it fails again with either half of the fix broken (`WHOLE_TIMES` emptied, or the multiply left out of `frame_whole_times`'s no-carry path). `python -I -B tests/run_all.py`, Windows (llvm-mingw): 674 passed, 48 failed, 46 skipped; main @ 310e7c9d: 673 passed and the same 48 failed (the one more is the new test). Linux (WSL, gcc): 601 passed, 40 failed, 127 skipped; the same 40 fail on main there. Those failures are this PC's setup, not this change. **Not tested:** a Linux game build and run (only Windows was built); Zora's Domain and the other places of the report (the fountain was the case reproduced); swimming. **Must be tested:** - Linux, any GPU: build, stand in water at a Great Fairy fountain or in Zora's Domain at a Frame rate cap of 240, expecting the ripples to spread smoothly as at 60 (Test Farm: `@Beanstalk` linux, ripples at a fountain at a 240 cap) ## Risks **What could break:** the water's ripples above 60 fps, if a scene's water has a substep count where the carry behaves differently; at a cap of 60 or 30 the game's own count is kept. **Turning it off:** revert the commit (a Frame rate cap of 60 also avoids the site's carry). **Compatibility:** the game is translated again once (a lift patch changed); saves and settings are unchanged. ## Issues Fixes #1199 ## Checklist ### Everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`) of the status line's type. - [x] Why gives the reason plainly and links the issues that fit (the tracker searched). - [x] Tested on my own PC where it runs (in the game, for a change the game runs), as Testing's Tested says; what can't be run by hand is in Testing's Not testable by hand, with why. - [x] Measurements has a verdict, or one line saying why there is nothing to measure. - [x] Nothing gets worse that I know of: any cost (speed, latency, memory, a setup that worked before) is measured and in Risks. - [x] Testing names what was tested, what wasn't, and what must still be tested, where and how. - [x] Rebased on current `main`. - [x] `python -I -B tests/run_all.py` passes (any failure that also fails on `main` is named). - [x] No game files, dumps, build output or generated files. - [x] `third_party/` untouched (a new folder with a `PROVENANCE.md` instead). - [x] The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled. ### When it applies - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. - [x] Numbers from the same PC, scene and settings, at least 2 interleaved runs each, the median reported. - [x] Screenshots of the same spot, captioned like the Measurements columns, for a change that shows on screen. - [x] A file in `docs/tested/` for each new measured run (format in `docs/tested-configurations.md`). - [x] A game-free test added for the fix, failing on `main` and passing here. - [x] A check under `tests/` that reads changed source updated in this PR, not weakened. - [ ] Host code builds on both Windows (llvm-mingw) and Linux, with UTF-8 paths. (Built on Windows; Linux not built: Must be tested.) - [x] Docs updated. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
The water renderer (f_800672e0) runs (int)step * substeps ripple substeps a frame. Above a 60 fps cap
the whole frames are carried per water object, so a frame runs all of its substeps or none: at 108 fps
with 4 substeps, 0 to 4 a frame, and the rings jump. The check patches the site's lifted lines as the
build does and runs them with host/nn_vi.c's hooks: it wants 2 or 3 substeps every frame at 108 fps,
1 or 2 at 144, and the game's own count at 60 and 30. On main: 0 to 4.

Assisted-by: Claude Code
Co-Authored-By: Claude Opus 5.5 <[email protected]>
The water renderer (f_800672e0) runs (int)step times the water's substeps (+76) of ripple
simulation a frame. Above a 60 fps cap the whole frames were carried per water object, so a frame
ran all its substeps or none, and the rings stood still for a frame and then jumped: at the Great
Fairy fountains and in Zora's Domain, fine at a cap of 60.

The site now carries the substeps (hos_frame_whole_times, host/frame_whole.h): at 108 fps with 4
substeps every frame runs 2 or 3 of them, still the 240 a second of 60 fps. At a cap of 60 the
game's own cut and multiply are kept. A lift that an earlier build patched with the whole frames
(a work folder keeps its translation) is patched again to the substeps.

Assisted-by: Claude Code
Co-Authored-By: Claude Opus 5.5 <[email protected]>
docs(tested): the fountain ripples on main and with the fix, at a 240 cap (#1199)
Some checks failed
Website / Website on Cloudflare (pull_request_target) Has been skipped
PR description / Description follows the template (pull_request_target) Successful in 3s
beanstalk/approval waiting for a BigBean's 👍 on the request
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
214ba20c6e
Assisted-by: Claude Code
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Author
Contributor

Tested in game: Windows 11 Pro 26300, RTX 4070, driver 616.56: Hyrule Castle Great Fairy fountain as child, cap 240. main @ 310e7c9d: the ripples jump. This PR @ 3eff1602 (a pack over the same base, same save): smooth with frame generation off (about 106 fps) and at 2x (about 87 fps).

Tested in game: Windows 11 Pro 26300, RTX 4070, driver 616.56: Hyrule Castle Great Fairy fountain as child, cap 240. main @ 310e7c9d: the ripples jump. This PR @ 3eff1602 (a pack over the same base, same save): smooth with frame generation off (about 106 fps) and at 2x (about 87 fps).
Author
Contributor

@Beanstalk linux, any GPU: build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.

@Beanstalk linux, any GPU: build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.
Member

@enum only members of BigBeans can start the farm.

One of them can approve this request by reacting 👍 to it or to this comment. This request was for 214ba20, and the PR has changed since (7ae18ce), so a 👍 no longer approves it. Comment @Beanstalk again to ask for the new commit.

@enum only members of `BigBeans` can start the farm. ~~One of them can approve this request by reacting 👍 to it or to this comment.~~ This request was for `214ba20`, and the PR has changed since (`7ae18ce`), so a 👍 no longer approves it. Comment `@Beanstalk` again to ask for the new commit.
docs(tested): two more interleaved runs of the fountain ripples on main and with the fix (#1199)
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 5s
beanstalk/approval waiting for a BigBean's 👍 on the request
Website / Website on Cloudflare (pull_request_target) Has been skipped
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
7ae18ce660
Assisted-by: Claude Code
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Author
Contributor

Two more interleaved runs at the fountain (main, fix, main, fix; nothing else running), 7ae18ce6: the water's frame-to-frame swing is 0.155 and 0.164 on main, 0.063 and 0.050 with the fix. With the first pair, the medians of 3 runs each are 0.155 on main and 0.052 here (spread 19% and 7%). Measurements and docs/tested updated; the Linux run is asked of the Test Farm above.

Two more interleaved runs at the fountain (main, fix, main, fix; nothing else running), 7ae18ce6: the water's frame-to-frame swing is 0.155 and 0.164 on main, 0.063 and 0.050 with the fix. With the first pair, the medians of 3 runs each are 0.155 on main and 0.052 here (spread 19% and 7%). Measurements and docs/tested updated; the Linux run is asked of the Test Farm above.
Author
Contributor

@Beanstalk linux, any GPU, for 7ae18ce6 (the earlier request was for 214ba20; the only change since is docs/tested): build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.

@Beanstalk linux, any GPU, for 7ae18ce6 (the earlier request was for 214ba20; the only change since is docs/tested): build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.
Member

@enum only members of BigBeans can start the farm.

One of them can approve this request by reacting 👍 to it or to this comment. This request was for 7ae18ce, and the PR has changed since (98b94d0), so a 👍 no longer approves it. Comment @Beanstalk again to ask for the new commit.

@enum only members of `BigBeans` can start the farm. ~~One of them can approve this request by reacting 👍 to it or to this comment.~~ This request was for `7ae18ce`, and the PR has changed since (`98b94d0`), so a 👍 no longer approves it. Comment `@Beanstalk` again to ask for the new commit.
Author
Contributor

Rebased on main @ 9af4808f (now 98b94d08; the four commits unchanged). run_all.py after the rebase: 676 passed / 47 failed / 46 skipped, the 47 the same as on main; test_water_substeps and test_frame_whole pass. The fountain numbers still hold: none of main's commits since 310e7c9d touches host/frame_whole.h, host/nn_vi.c, nx2/oot_patches.py or tests/test_frame_whole.py.

Rebased on main @ 9af4808f (now 98b94d08; the four commits unchanged). run_all.py after the rebase: 676 passed / 47 failed / 46 skipped, the 47 the same as on main; test_water_substeps and test_frame_whole pass. The fountain numbers still hold: none of main's commits since 310e7c9d touches host/frame_whole.h, host/nn_vi.c, nx2/oot_patches.py or tests/test_frame_whole.py.
enum force-pushed fix/water-ripples-above-60 from 7ae18ce660
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 5s
beanstalk/approval waiting for a BigBean's 👍 on the request
Website / Website on Cloudflare (pull_request_target) Has been skipped
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
to 98b94d08ae
Some checks failed
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Website / Website on Cloudflare (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Has been cancelled
Website / Website on Cloudflare (pull_request_target) Has been skipped
beanstalk/approval needs a second approval (sensitive paths)
2026-11-18 02:59:54 +00:00
Compare
Author
Contributor

@Beanstalk linux, any GPU, for 98b94d08 (the earlier request was for 7ae18ce6; the only change since is the rebase on main): build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.

@Beanstalk linux, any GPU, for 98b94d08 (the earlier request was for 7ae18ce6; the only change since is the rebase on main): build this PR and main, load a save at a Great Fairy fountain (or stand in the water in Zora's Domain), set the Frame rate cap to 240 with frame generation off, and walk a few steps in the water. Expected: on main the ripple rings stand still for a frame and then jump; with this PR they spread smoothly, as at a cap of 60. A frame log (RX_VK_FRAMELOG) of a few seconds standing in the water after walking, from each build, would show it.
Member

@enum only members of BigBeans can start the farm. One of them can approve this request by reacting 👍 to it or to this comment.

@enum only members of `BigBeans` can start the farm. One of them can approve this request by reacting 👍 to it or to this comment.
Member

@futondestroyer approval of 98b94d0 recorded. This diff touches sensitive paths, so a second member of BigBeans must approve it too.

@futondestroyer approval of `98b94d0` recorded. This diff touches sensitive paths, so a second member of `BigBeans` must approve it too.
Member

Beanstalk test farm

Commit 98b94d0 · tier untrusted · approved by futondestroyer (👍 on enum's request) · dashboard

This diff touches sensitive paths, so it needs two members of BigBeans: nx2/oot_patches.py

A member of BigBeans can review this commit and comment @Beanstalk to test it.

<!-- beanstalk:sticky --> ### Beanstalk test farm Commit `98b94d0` · tier **untrusted** · approved by futondestroyer (👍 on enum's request) · [dashboard](https://beanstalk.magicbean.dev/prs/1498) This diff touches sensitive paths, so it needs two members of `BigBeans`: `nx2/oot_patches.py` A member of `BigBeans` can review this commit and comment `@Beanstalk` to test it.
Some checks failed
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Website / Website on Cloudflare (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Has been cancelled
Website / Website on Cloudflare (pull_request_target) Has been skipped
beanstalk/approval needs a second approval (sensitive paths)
This pull request is marked as a work in progress.
Some workflows are waiting to be reviewed.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'fix/water-ripples-above-60:enum-fix/water-ripples-above-60'
git switch 'enum-fix/water-ripples-above-60'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
MagicBeanDev/Longshot!1498
No description provided.