feat(framegen): AMD FSR 4 and AMD FSR 3.1 as Frame generation by choices #2665
Open
notquiteog wants to merge 1 commit from
notquiteog/feat/framegen-by-amd into main
pull from: notquiteog/feat/framegen-by-amd
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
2 participants
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!2665
Loading…
Reference in a new issue
No description provided.
Delete branch "notquiteog/feat/framegen-by-amd"
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 Frame generation by row offers Auto and Built-in only: a player with an AMD card has no way to pick AMD's own frame generation from the menu, and FSR 3.1's interpolation is reachable only through
RX_VK_FSR_FG=1. This adds both as choices of the row. It is the "FidelityFX FSR 4 fallback as a small, separate PR" asked for when #1831 was closed.The AMD FSR 4 half has not been run: AMD's runtime is Windows DLLs and this PC is Linux with an NVIDIA card. It is up for review as it is, with that said plainly; it needs a run on Windows with an AMD card before it merges, and I would be glad of one (
testing wanted).What it does
vk_ffx.cpp), from the scene's depth, motion and camera; every made frame of a set in one dispatch--fsr, AMD's DLLs beside the gamevk_fsr3fi.cpp), chosen in the menu at 2xframegen_methods.his the choice, pure and tested: a value that does not run on this PC is stepped over by the arrows and shown as Auto when it comes from a saved file, and a set a method cannot make whole goes to the renderer's own, never to nothing. DLSS Frame Generation reads the row as it is shown (framegen_by_auto), so a saved AMD value on an NVIDIA PC still gets DLSS-G.vk_ffx.cpphands AMD's runtime our own images on our own command buffer (its "manual" dispatch, no swapchain of AMD's): Hookshot keeps presenting and pacing. A present it did not make is told to it as a reset. A context that cannot be made turns the choice off for the run and the row goes back to Auto.camera_vectors.h: the camera's position and axes in the world from the projection and view-projection, which AMD's runtime takes.third_party/fidelityfxbeside the four already there (MIT, same pinned SDK; the README there says which). AMD's frame generation DLL is not fetched byscripts/ffx_sdk.pyyet: the readme says to put it beside the loader.vk_api.h.How it was tested
tests/run_all.py(Linux), with main at65a4d874merged in: 500 passed, 2 failed, 22 skipped. Two checks fail on this branch exactly as they fail on main at65a4d874without it:test_readme_menu_rows(the Skip opening row has no readme line; #2857 is open for it) andtest_program_cache_one_variant(its fixture lacks the zstd cache's names since #1630). New:test_framegen_methods,test_camera_vectors.--fsr).vk_ffx.cpp's Windows side and the other touched files passclang++ --target=x86_64-w64-mingw32 -fsyntax-onlywith-DHOOKSHOT_FSR.65a4d874(run again after that merge): RTX 5060 Ti 16 GB, driver 615.71.09, Linux (COSMIC, Wayland), Kokiri Forest, 2048x1152 output, DLSS, V-Sync Off, 50 to 60 fps of game frames, no error or lost device in the log.fsr3fi: 600 of the last 600 made frames by FSR 3.1, 0 without its inputs; at 3x the renderer's own makes the set and the scene's inputs are no longer kept.Not tested
Known and left
RX_VK_FG_METHOD=fsr3does not start FSR 3.1 by itself (fsr3fi::asked()reads the row, andRX_VK_FSR_FGgoes over both); the row does.ffx::shutdown()is not called at exit.🤖 Generated with Claude Code
WIP: feat(framegen): AMD FSR 4 and AMD FSR 3.1 as Frame generation by choicesto feat(framegen): AMD FSR 4 and AMD FSR 3.1 as Frame generation by choicesHi, I know this isn't part of your PR, but I recommend changing "Auto" to DLSS, and move it over so 0 becomes Built-In and 1 becomes DLSS. We had discussions about it w/ the person who implemented DLSS, and that's what we like to do. We would like to basically hit two birds with one stone in this case. Thank you!