build(vk): vendor AMD's FSR 3.1 passes and the script that compiles them #1313
Closed
notquiteog wants to merge 1 commit from
pr/fsr-sdk-passes into main
pull from: pr/fsr-sdk-passes
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!1313
Loading…
Reference in a new issue
No description provided.
Delete branch "pr/fsr-sdk-passes"
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?
What
The first part of #822, split out as requested there: only the vendored FidelityFX SDK sources and the script that compiles them. Nothing in the renderer uses them yet; the backend that records these passes, and the camera and frame-pacing changes, come later as separate PRs.
third_party/fidelityfx-sdk/c6efa6bf): the common core,fsr3upscaler,frameinterpolation,opticalflow,spd,fsr1. Unmodified, MIT, withLICENSE.txtand aPROVENANCE.mdsaying what each folder is and where it came fromscripts/fsr3_shaders.pygpu/vk/shaders/fsr3_*_spv.hwith the one option set the renderer will record them under;--checkcompares instead of writinggpu/vk/shaders/fsr3_*_spv.htests/test_fsr3_shaders.pyrun_all.pywith a{glslang}tool, skipped on Windows (as thespirv-valchecks are);source-regressions.ymlinstallsglslang-toolsfor itNo runtime library is involved: this is the SDK-source route, which runs on any GPU on Windows and Linux, not AMD's FidelityFX API.
Testing
c6efa6bf7f2027b3ec94f28578bb5965eabb9e55: 76 of 76 identical.python -I tests/run_all.py tests/test_fsr3_shaders.pywith glslang 16.2.0 and spirv-val: 28 match.Size
49,075 added lines, almost all of it the two mechanical parts: AMD's GLSL (unmodified, checked above) and the generated SPIR-V headers (checked by the test). The reviewable code is
scripts/fsr3_shaders.py, the test, and four lines ofrun_all.pyand the workflow.🤖 Generated with Claude Code
Thanks for splitting this out. Provenance looks right: AMD's MIT notice in LICENSE.txt, and PROVENANCE.md with the upstream URL, v1.1.4 and the commit. A few things before it can go in:
CI red, caused by the workflow change. Adding
glslang-toolsto the apt install insource-regressions.ymlputsglslangValidatoron PATH.tests/test_dlss_actor.pyonly compares the SPIR-V words of the checked-in DLSS headers when glslang is present, so on main that check is skipped. With the apt glslang the words differ, and it fails with "dlss_actor_frag_spv.h is not made from dlss_actor.frag as it is now". Options: install the glslang that made the existing headers, scope the package to the FSR3 step only, or make that test tolerant of version differences.tests/test_fsr3_shaders.pyitself passes.Needs a rebase. It's 82 commits behind main and conflicts in
tests/run_all.py.Option set. This compiles with HDR_COLOR_INPUT=1 and INVERTED_DEPTH=1. #1095 compiles the same passes with LDR colour and standard depth, and says that matches the renderer's inputs from #1008. One of the two is wrong for what the renderer feeds in, and nothing here pins or checks the options. Worth reconciling against the backend that will record these passes.
Reproducibility. glslang isn't pinned, and the version that made the headers isn't recorded in the script or PROVENANCE.md. Recording it would help the next regeneration.
Overlap. #1095 vendors the same SDK commit into the same
third_partypath with the samefsr3_*_comp_spv.hnames, and #1335 ships this same header set too, so only one of the three can land. This one is the superset (it adds frame interpolation and optical flow, which nothing uses yet). It would be good to settle with the other authors which one carries the shaders.Nits: PROVENANCE says "eleven frame-interpolation passes", but
FI_VARIANTShas 10. Comments mentiongpu/vk/vk_fsr3.cppandvk_fsr3fi.cpp, which don't exist on main.Superseded by #1386, which carries the same vendored FidelityFX SDK (v1.1.4, MIT) and compile script together with the FSR 3.1 upscaler and frame generation that use them. Closing so review happens in one place. Thanks!