feat(menu): add isolated DLSS5 sessions with F1 controls and reset #1542
Open
mikaba-eu wants to merge 14 commits from
mikaba-eu/pr/linux-dlss-adapter into main
pull from: mikaba-eu/pr/linux-dlss-adapter
merge into: MagicBeanDev:main
MagicBeanDev:main
MagicBeanDev:github/pr/2893
MagicBeanDev:github/pr/2890
MagicBeanDev:github/pr/2887
MagicBeanDev:github/pr/2878
MagicBeanDev:github/pr/2875
MagicBeanDev:github/pr/2874
MagicBeanDev:github/pr/2873
MagicBeanDev:github/pr/2871
MagicBeanDev:github/pr/2756
MagicBeanDev:github/pr/2897
MagicBeanDev:github/pr/2896
MagicBeanDev:github/pr/2718
MagicBeanDev:github/pr/2842
MagicBeanDev:github/pr/2691
MagicBeanDev:github/pr/2895
MagicBeanDev:github/pr/2743
MagicBeanDev:github/pr/2765
MagicBeanDev:github/pr/2708
MagicBeanDev:github/pr/2732
MagicBeanDev:github/pr/2755
MagicBeanDev:github/pr/2817
MagicBeanDev:github/pr/2876
MagicBeanDev:release-please--branches--main
MagicBeanDev:release-please--branches--main--release-notes
MagicBeanDev:github/pr/2778
MagicBeanDev:github/pr/2888
MagicBeanDev:github/pr/2866
MagicBeanDev:github/pr/2877
MagicBeanDev:github/pr/2800
MagicBeanDev:github/pr/2829
MagicBeanDev:github/pr/2850
MagicBeanDev:github/pr/2889
MagicBeanDev:github/pr/2882
MagicBeanDev:github/pr/2860
MagicBeanDev:github/pr/2849
MagicBeanDev:github/pr/2886
MagicBeanDev:github/pr/2794
MagicBeanDev:github/pr/2840
MagicBeanDev:github/pr/2830
MagicBeanDev:github/pr/2834
MagicBeanDev:github/pr/2719
MagicBeanDev:github/pr/2742
MagicBeanDev:github/pr/2741
MagicBeanDev:github/pr/2820
MagicBeanDev:github/pr/2771
MagicBeanDev:github/pr/2859
MagicBeanDev:github/pr/2858
MagicBeanDev:github/pr/2823
MagicBeanDev:github/pr/2757
MagicBeanDev:github/pr/2769
MagicBeanDev:github/pr/2844
MagicBeanDev:github/pr/2843
MagicBeanDev:github/pr/2673
MagicBeanDev:github/pr/2855
MagicBeanDev:github/pr/2739
MagicBeanDev:github/pr/2807
MagicBeanDev:github/pr/2851
MagicBeanDev:github/pr/2789
MagicBeanDev:github/pr/2814
MagicBeanDev:github/pr/2818
MagicBeanDev:github/pr/2774
MagicBeanDev:github/pr/2772
MagicBeanDev:github/pr/2750
MagicBeanDev:github/pr/2786
MagicBeanDev:github/pr/2785
MagicBeanDev:github/pr/2782
MagicBeanDev:github/pr/2779
MagicBeanDev:github/pr/2775
MagicBeanDev:github/pr/2706
MagicBeanDev:github/pr/2766
MagicBeanDev:github/pr/2747
MagicBeanDev:github/pr/2759
MagicBeanDev:github/pr/2745
MagicBeanDev:github/pr/2740
MagicBeanDev:github/pr/2733
MagicBeanDev:github/pr/2725
MagicBeanDev:github/pr/2727
MagicBeanDev:github/pr/2728
MagicBeanDev:github/pr/2729
MagicBeanDev:github/pr/2721
MagicBeanDev:github/pr/2722
MagicBeanDev:github/pr/2715
MagicBeanDev:github/pr/2714
MagicBeanDev:github/pr/2707
MagicBeanDev:github/pr/2703
MagicBeanDev:github/pr/2705
MagicBeanDev:github/pr/2697
MagicBeanDev:github/pr/2679
MagicBeanDev:github/pr/2676
MagicBeanDev:github/pr/2669
MagicBeanDev:docs/what-hookshot-connects-to
MagicBeanDev:fix/hdr-encode-test
MagicBeanDev:fix/main-tests
MagicBeanDev:fix/play-cache-files
MagicBeanDev:perf/game-barrier-order
MagicBeanDev:feat/heap-lazy
MagicBeanDev:feat/texture-detail
MagicBeanDev:perf/astc-opaque-bc1
MagicBeanDev:fix/fs-dir-lock
MagicBeanDev:fix/framegen-native-kept
MagicBeanDev:fix/update-no-downgrade
MagicBeanDev:port/k10-gcn-f16-mirrors
MagicBeanDev:fix/framegen-mult-cap
MagicBeanDev:chore/release-as-2.1.1
MagicBeanDev:perf/pcache-load-switch
MagicBeanDev:fix/prepare-progress-log
MagicBeanDev:fix/update-closes-stale-game
MagicBeanDev:fix/hdr-scaled-sampled
MagicBeanDev:perf/first-start-preset
MagicBeanDev:perf/zero-upload
MagicBeanDev:fix/vcore-escape-2s
MagicBeanDev:test/fake-gh-atomic
MagicBeanDev:perf/batch-idle-flush
MagicBeanDev:test/finish-stub-a
MagicBeanDev:chore/record-2.1.0
MagicBeanDev:fix/main-red-tests
MagicBeanDev:fix/test-display-startup-driver-cache
MagicBeanDev:feat/mesh-shader-mode
MagicBeanDev:fix/menu-probes-at-startup
MagicBeanDev:fix/fps-counter-classic
MagicBeanDev:fix/test-log-batch-flake
MagicBeanDev:fix/narrow-screen-hud
MagicBeanDev:ci/prereleases
MagicBeanDev:release/v2.0.15
MagicBeanDev:hotfix/v2.0.15
MagicBeanDev:fix/present-ahead-replay
MagicBeanDev:release/v2.0.13
MagicBeanDev:fix/bracket-paths-2013
MagicBeanDev:fix/hdr-overlays-2013
MagicBeanDev:fix/fps-counter-scale-2013
MagicBeanDev:fix/stick-seen-at-rest
MagicBeanDev:hotfix/menu-fits-screen
MagicBeanDev:fix/f1-always-opens-menu
MagicBeanDev:fix/ini-keep-lines
MagicBeanDev:claude/cranky-pike-7cf247
MagicBeanDev:perf/texture-answer-flat
MagicBeanDev:fix/stamp-test-modules
MagicBeanDev:fix/appimage-fonts
MagicBeanDev:fix/display-awake
MagicBeanDev:release/v2.0.12
MagicBeanDev:fix/discord-windows
MagicBeanDev:rc/v2.0.12-tests
MagicBeanDev:fix/dlss-keep-feature
MagicBeanDev:rc/v2.0.12
MagicBeanDev:button-icons
No reviewers
Labels
Clear labels
accessibility
Barrier affecting people with disabilities
autorelease: pending
autorelease: tagged
bug
Something isn't working
dependencies
Pull requests that update a dependency file
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
github_actions
Pull requests that update GitHub Actions code
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
testing wanted
wontfix
This will not be worked on
No labels
accessibility
autorelease: pending
autorelease: tagged
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
question
testing wanted
wontfix
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
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/Hookshot!1542
Loading…
Reference in a new issue
No description provided.
Delete branch "mikaba-eu/pr/linux-dlss-adapter"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
The optional external enhancement needs its own helper lifetime, private IPC and usable in-game controls. This adds isolated Linux DLSS5VKLayer sessions and native F1 Graphics settings, refreshed onto current upstream without bundling model/runtime binaries or game data. Implemented with GPT-6 Astra medium & xhigh.
The adapter verifies a private integration manifest, uses private tmpfs IPC and a dedicated Proton prefix, scopes the Vulkan layer to the child game, persists selected preferences and tears down only its own session. Recovery tracks replacement helper metadata using process identity checks and waits boundedly for the replacement before private wineserver teardown. Ended sessions retain archived status without recreating IPC.
The F1 Graphics page exposes all 19 external enhancement settings through basic/advanced controls and reports model availability. A bounded versioned file protocol separates the renderer from the external shared-memory ABI: native file I/O and Python control/persistence run on workers, complete requests are validated before application, and helper polling occurs only while the page is open. The former local F10 companion-menu workflow is removed. This is separate from Hookshot's built-in NVIDIA DLSS support.
Three source patches for external revision c77b64c cover stable host mappings, image-owned presentation completion and swapchain access masks. That code retains the external AGPL-3.0 license. The newer GPU-image transport/per-queue work is a separate external-repository change and is not required by this adapter. No global layer registration, download, system security change or player profile is included.
Validation: 17 adapter lifecycle cases and 11 bridge behavior cases pass; native client/menu checks cover worker exchange, stale/unavailable state, full-setting requests and menu routing. All 365 eligible Linux source checks passed, with 14 documented platform/tool skips, across the serial suite and fixture/upstream follow-ups on
ddafc1f9. The isolated renderer compiled successfully before the latest HDR/FSR merge; final combined-build and foreground acceptance results are recorded below. Prior integrated helper recovery verified replacement shutdown and exported-FD cleanup. Model activity is not a guarantee of visual quality, and this adapter does not claim a performance gain.The Reset DLSS5 settings action restores and saves all 19 factory values with one Enter/controller-confirm/click activation; arrows do nothing and pending/unavailable sessions disable it. The adapter validates a complete factory snapshot and forces exact values for reset, including sub-percent values hidden by UI rounding. Regular edits preserve untouched precision. Default values and behavior are documented.
The reset addition passed 25 affected native-menu, adapter, bridge and analysis checks after the prior complete source coverage. The final combined Linux renderer compiled and linked successfully, with unchanged host ABI. Upstream release-only changes through
2e62a977also passed the two affected release/update checks.Native F1 settings and reset:
Foreground Linux/NVIDIA acceptance used copied saves/preferences and the final combined runtime (host source
d527692a, rendererbae50216): real keyboard navigation changed Detail80→85%, advanced Apply model1→0→1, and saved values reappeared after a fresh session. Closing F1 then pressing F10 opened no companion menu. The final Reset action ignored arrows, restored all19 helper values and the saved JSON exactly to factory defaults, and those defaults reloaded after another fresh session. Native game-options hashes were unchanged; presentation/helper/composition counters continued advancing and logs showed no transport quarantine. Screenshots above are from the final reset build. This validates the combined runtime's UI/lifecycle, not every platform or an FPS gain.Heads-up: this conflicts with main now (a lot landed today). Could you merge main into the branch (or rebase) and resolve the conflicts? Thanks!
Merged current main (
1392ea3) and resolved the conflicts, preserving upstream replacements where they supersede our changes. Migrated local tests to the new per-test runner declarations. Independent source suites and the combined suite pass; fresh Linux gameplay results and limitations are recorded in the updated description. Hyrule Field and a warm Forest run completed the short movement tests, but camera hitches remain; earlier memory-guard stops and the incomplete Market event are not reported as passes. AI-assisted development: GPT-6-Astra (medium and xhigh).Refreshed again to main
117eae7and resolved the new Anti-Lag source-fixture conflict. Complete Linux source suite re-run: 305 passed, 0 failed, 18 skipped. Existing gameplay evidence remains explicitly tied to its tested build.Heads-up: this conflicts with main now. Could you rebase onto main and resolve the conflicts? Thanks!
This is careful work. The menu rows only appear when
HOS_DLSS5_CONTROLnames an absolute folder,menu_tickreturns at once otherwise, the file protocol is bounded and fully validated before anything is applied, and the Python adapter only signals processes it can prove are its own (start-time stamps, its own child's process group). At the PR's head on Linux, all sixtests/test_dlss5_*.pyand the three menu fixtures you updated (test_framegen_preset,test_rumble_menu,test_stick_dead_zone) pass, and the fixture updates add stubs rather than weakening any check. At about 2,600 lines I concentrated on the in-tree native side (gpu/vk/dlss5_controls.h, thevk_menu.cppchanges), the adapter's process and file handling, and repository rules; I skimmed the external patches but didn't review them line by line.gpu/vk/vk_menu.cpp(the includes, theRowtable,save()andmenu_tick). CI also hasn't run beyond the title check, so the Windows and llvm-mingw builds of the new header and menu code are still unverified. Please rebase and let CI run.gpu/vk/vk_menu.cpp:61:HOS_DLSS5_CONTROLis a new runtime switch, but it isn't indocs/development.md's switch table, which CONTRIBUTING.md asks for ("Document them where the surrounding switches are documented").docs/external-enhancement-settings.mdcovers the settings, not the switch.docs/images/dlss5-f1-basic.png,docs/images/dlss5-f1-advanced.png: these commit 1.6 MB of in-game screenshots into the repository's history. The repo currently tracks no game imagery, just the logo. Screenshots belong in the PR description (CONTRIBUTING.md, Commits and pull requests), where they're fine. Please host them as PR attachments and drop the files and the doc links to them.patches/dlss5/*.patch: these are patches to an AGPL-3.0 project, and the README says they stay under AGPL. Combining with GPLv3 is allowed (GPLv3 §13), but the repo's convention for third-party material is a folder with a note inPROVENANCE.md(upstream, pinned revision, licence). Please add that entry so the mixed licence is recorded where people look for it.tests/test_dlss5_mapping.py,tests/test_dlss5_present_sync.py: both read the external checkout underwork/dlss5/sourceand skip silently without it, whilerun_all.pystill reports them as passed (0.0 s here). CI never seeswork/, so the three patches are never exercised. Either say so withRUN_ALL_SKIP(both OSes, "needs the external DLSS5VKLayer checkout") so the table shows a skip, or drop them fromtests/.HOS_DLSS5_CONTROL.No new commits since my review at
43824c2, and the merge with main still conflicts ingpu/vk/vk_menu.cpp. Before the author spends time on another rebase, two questions need a maintainer answer.HOS_DLSS5_CONTROL?The other open points are the author's to fix:
docs/images/, which the repo doesn't track (they belong in the PR description);PROVENANCE.mdentry forpatches/dlss5/;HOS_DLSS5_CONTROLmissing fromdocs/development.md;#1543's
tests/test_analysis_dlss.pydepends on this PR'sscripts/dlss5_api.py, so the two shouldn't be decided separately.