Repository navigation
fix(vk): capture switches follow the on/off rule - #2651
Merged
Merged
Conversation
Use env_on for the three presence-only reads introduced by NotRexed#2437. Zero, false, off and no now leave the capture alternatives disabled, as documented; defaults and enabled behavior stay unchanged. Assisted-by: GPT-6 Astra Co-Authored-By: GPT-6 Astra <noreply@openai.com>
This was referenced Nov 12, 2026
NotRexed
added a commit
that referenced
this pull request
Nov 12, 2026
`test_hdr_encode` still fails on main: DLSS's `TemporalEngine` gained two fields after `hdr` (#2574), and the check looked for the list ending there. It now matches the fields it means, whatever follows them. The rest of #2660 landed separately (#2651, #2652, #2654), so #2660 is closed in favour of this. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 12, 2026
notquiteog
added a commit
to notquiteog/Hookshot
that referenced
this pull request
Nov 12, 2026
…seeded, V-Sync Auto with DLSS Frame Gen, NotRexed#2746) Upstream fixed most of what e3f076a fixed here (NotRexed#2648, NotRexed#2651, NotRexed#2652, NotRexed#2653, NotRexed#2654, NotRexed#2661), so the conflicts are resolved to upstream's versions: its fixtures, its menu_i18n.h, its mouse_native.c, and its dlss_checks.h with the two-pixel tolerance it chose and tests. Kept from the fork: the fixtures' framegen_by_pick stand-in, and vk_texture.cpp's typed min. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Joey-Magnus
added a commit
to Joey-Magnus/Hookshot
that referenced
this pull request
Nov 12, 2026
- docs/development.md: main rewrote the RX_VK_VRAM_MB row (the budget in MiB, counted by blocks, NotRexed#2624; the integrated GPU's caps, NotRexed#2603) and added the RX_VK_CAPTURE_KEEP_OLD row above it (NotRexed#2651). Kept main's rows as they are and this branch's RX_VK_KEEP_RESAMPLED_MB row right after the budget's, as before. - gpu/vk/vk_texture.cpp merged without a conflict. Main's changes to the eviction pass (the textures that go kept in a set, the 97% squeeze held off while the pool is down to its blocks made at the start, the integrated GPU's budget, the drawn write-back) leave the keep rules as they were: keep_resampled still comes before the compaction hold, its age line is still vram_compact::kReserveUnused (strict), its pre-pass still tests the flags before the overlap scans, and resampled is still cleared at both places released goes back to false. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this is for: make the two capture-buffer switches follow the documented on/off rule, and restore the existing switch check (current main CI). What is measured: the affected game-free check before and after, with GCC 16.2.1 and Clang 23.1.3 selected, plus one strict full-suite run, as recorded below. Not measured: a game run or Windows execution.
Cause
#2437 added two presence-only reads of
RX_VK_CAPTURE_KEEP_OLDand one ofRX_VK_CAP_BLOCKSingpu/vk/vk_memory.cpp; setting them to0therefore enabled the alternatives, contrary tohookshot_env.hand the existingtest_env_on.pyrule.The relevant failure in main's CI log is:
What changed
Use the existing
env_onhelper at those three sites and document the switches indocs/development.md; defaults, enabled behavior, allocation policy and the test remain unchanged.How it was tested
Recorded on 2026-11-11, Linux kernel
7.2.15-1-omarchy, basede866017, head8d7f7d47(version and test records).a016b7a6: the affected check fails independently in both compiler environments with the diagnostic above; the branch passes independently in both (python -I -B tests/run_all.py --strict --jobs 1 tests/test_env_on.pyrecords).0,false,offandno(standalone records).python -I -B tests/run_all.py --strict:456 passed, 14 failed, 20 skipped in 139 s (linux, 32 at once), load 17.65 → 26.92 (complete suite output).test_wayland_libdecor_hint.py,test_display_startup_failure.py,test_texel_buffer_ownership.py,test_audio_aux.py,test_audio_biquad.py,test_dlss_checks.py,test_framegen_preset.py,test_hdr_encode.py,test_linux_docker_packages.py,test_menu_i18n.py,test_mods_size_table.py,test_mouse_native.py,test_readback_part.py,test_rumble_menu.py(complete suite output). The companion fixture, PPA-parser, camera-handover and hint-catalog branches address their separate causes; feat(vk): FSR 3.1 on the chain keeps the game's native HDR highlights #2614 owns the HDR check and is not duplicated here.Not tested / risks
The deliberate behavior change is for values that explicitly mean off; no Vulkan allocation or game run was performed, so allocation timing and hardware behavior are not measured.
Overlaps
The inspected same-file code changes merge cleanly; #2338 and #2618 add different documentation rows at the same insertion point, so those rows and this one must be retained together (recorded overlap hunks).
Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra noreply@openai.com