Repository navigation
fix(vk): present ahead's vk_replay.cpp half, lost in #1720's merge (main doesn't link) - #1858
Merged
Merged
Conversation
#1720's last commit put vk_replay.cpp back to main's copy so main could be merged in ("present ahead re-applied next"), and the PR was merged before that re-apply. Main then declared present_commit and present_defer_into (vk_framegen.h) and called them from the display thread with no definition: the AppImage's hookshot_vk.so has 2 unresolved symbols and every build on main fails to link. This puts back the 24 lines from the PR's previous head (7006ea0), on main's present_image, which now checks vkQueueSubmit2 for device loss: the check stays before the deferral. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 10, 2026
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.
Main doesn't link since #1720 merged. The AppImage job says:
Why: #1720's last commit (a259978) reset
vk_replay.cppto main's copy so main could be merged in, with "present ahead re-applied next". The PR was merged before that re-apply. Main ended up with:vk_framegen.hdeclaringpresent_commitandpresent_defer_into;vk_framegen.cppcalling them;Fix: put back the 24 lines from the PR's previous head (7006ea0) on current main:
present_defer_intothread-local;present_image's deferral after its copy's submit;present_commit;present_image's present split out aspresent_out.Main's
present_imagenow checksvkQueueSubmit2for device loss, and that check stays ahead of the deferral.Present ahead only runs for a paced 2x frame-generation set with two spare swapchain images (#1720's conditions). Everything else presents through
present_outexactly as before. CI compiles and tests it here, includingtests/test_present_ahead.py, which readsbool present_commit(from vk_replay.cpp. I'll check frame generation 2x pacing in game before relying on it.🤖 Generated with Claude Code