fixed like everything on the readme also added some stuff like loader.bat #2017
Open
mimic-wasm wants to merge 10 commits from
mimic-wasm/mimic-wasm-patch-1 into main
pull from: mimic-wasm/mimic-wasm-patch-1
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!2017
Loading…
Reference in a new issue
No description provided.
Delete branch "mimic-wasm/mimic-wasm-patch-1"
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?
Improve HUD Aspect Ratio, Graphics Settings and Performance
Summary
This PR introduces several graphics, HUD, and performance improvements to Hookshot.
Changes
HUD
Graphics
PS3-style preset
Performance
Tests
Expected Results
Testing
The four targeted Python tests passed.
Full hardware validation is still needed.
loader.bat code:
@echo off
set RX_VK_GPU_UNSWIZZLE=1
set RX_VK_BATCH=1
hookshot.exe
Thanks for this. The narrow-screen HUD fix is a good catch, and it's already been taken into #2015 (the
oot_wide.pyvertical squeeze, thehos_main.clines, and your widescreen tests), with you credited as co-author. It's being checked in game in 4:3 and 16:10 windows before it merges.The rest can't go in as it is:
loader.batandhookshot_env.txtat the repo root: these look like your local setup. Thehookshot_env.txtsetsRX_VK_NOOPT=1, a debug switch that turns the game code's optimizer off. Neither belongs in the repository.hos_ini_option("native_3d_resolution", 1)changes every player's default from the game's 0.8 scene scale to 1.0, about 25% more pixels to draw, which costs fps for everyone. Defaulting to 0 would keep today's behaviour (HOS_SCENE_NATIVEalready turns it on).If you'd like to continue: one PR per change, without the local files, each with how you tested it (GPU, resolution, what you saw). The HUD part needs nothing more from you, since #2015 carries it.
🤖 Generated with Claude Code
I checked this one for anything risky first, since the title doesn't match the diff (nothing in the README changes). It's clean: nothing downloads or runs remote code, there are no binaries or obfuscated content, no workflow or release/update URL changes, and nothing touches credentials.
loader.batonly sets two env vars and starts the localhookshot.exe.NotRexed's review covers the rest, and I agree with all of it. The HUD part is already carried by #2015.
loader.batandhookshot_env.txtare local setup (RX_VK_NOOPT=1turns the optimizer off). Native 3D resolution defaulting to on changes everyone's default. The PS3 preset's hint mentions GTA V and the preset has no measurements behind it. The Sampler cache move should be its own PR, and the tests the description mentions aren't in the branch.Two more things:
vreg[4] + 4. Eachvregis 16 bytes (uint64_t vreg[32][2]), so that write scales lanes 1-3 of Q4 and lane 0 of Q5. If the row is Q4 lanes 0-3 (the way the horizontal path scales all of Q1), the offset should be 0. If it really is lanes 1-3, the copy should be 12 bytes. #2015 has the same line, so it's worth checking there before it merges (inline note).The
test_env_file.pychange (SDL_AUDIO_DRIVER) is fine:SDL_names already pass the env-file filter.@ -0,0 +1,2 @@RX_VK_NOOPT=1Local debug settings (optimizer off, checkpoints on). Please drop this from the PR, as NotRexed said.
@ -0,0 +1,4 @@@echo offHarmless (it sets two env vars and starts the local exe), but it's a personal launcher. Please drop it too.
hookshot_env.txtbeside the exe already does the same job.@ -49,1 +52,4 @@"else if (_qy > 0.0f && _qy < 1.0f) { memcpy(_row, (const uint8_t *)c->vreg[4] + 4, 16); ""for (int _k = 0; _k < 4; _k++) _row[_k] *= _qy; memcpy((uint8_t *)c->vreg[4] + 4, _row, 16); } ""} } } } /* (nx2/oot_wide.py: HUD keeps 16:9 on wide and narrow screens) */"% (UI_M00, UI_M11, " : ".join("_vt == 0x%xULL ? %du" % (v, 1 << k) for k, v in enumerate(KEEP_VTABLES)) + " : 0u"))c->vreg[4]is one 16-byte Q register, so a 16-byte copy from+ 4reads and writes the first float of Q5 too. Should this bec->vreg[4]with 16 bytes (the whole row, like the Q1 path), or 12 bytes from+ 4? The same line is in #2015.Heads-up: this conflicts with main now. Could you rebase onto main and resolve the conflicts? Thanks!
I'd close this one. The useful part, the vertical HUD squeeze in
nx2/oot_wide.pyandhost/hos_main.c, is carried by #2015 with you as co-author. #2015 is still open on main, and the 16-byte write atvreg[4] + 4hckrman101 flagged should be checked there.Nothing else here can go in as it is, and there's been no update since NotRexed's review yesterday:
loader.batandhookshot_env.txtat the repo root are local setup. The env file turns onRX_VK_NOOPT=1, a debug switch.hos_ini_option("native_3d_resolution", 1)changes every player's scene scale from 0.8 to 1.0, about 25% more pixels to draw.hos_main.cstill readsHOS_SCENE_NATIVEwithatoi, where main now usesenv_on(#2042).The branch also conflicts with main in
vk_menu.cppandhos_main.c, and the title doesn't describe the change. If you want to pursue any of these, a fresh branch from main per change, with how you tested it, is the way forward.