Repository navigation
fix(vk): restore present ahead's vk_replay.cpp half, left out when #1720 merged - #1853
Closed
mayathaim-hue wants to merge 2 commits into
Closed
mayathaim-hue wants to merge 2 commits into
mayathaim-hue wants to merge 2 commits into
Conversation
Merge NotRexed/Hookshot main into fix/present-ahead
…tRexed#1720 merged NotRexed#1720 was merged at a259978, a one-step commit that had vk_replay.cpp back at main's version while main was being merged in, so main has vk_framegen.cpp calling present_commit / present_defer_into with no definition (an unresolved link) and test_present_ahead.py / test_present_semaphores.py failing. This puts back the 24 lines on top of main 51de681: present_defer_into, present_commit, and present_image's end as present_out, after main's device-loss check on the copy's submit.
Contributor
Author
|
Closing in favour of #1858, which puts back the same 24 lines. |
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.
#1720 was merged at a259978, a one-step commit on its branch where
gpu/vk/vk_replay.cppwas briefly back at main's version (to get past a conflict while merging main in; the next commit was to re-apply it). So main now hasvk_framegen.cppcallingpresent_commitand usingpresent_defer_into, which nothing defines (an unresolved link on every build), andtests/test_present_ahead.pyandtests/test_present_semaphores.pyfail.This puts back the missing 24 lines in
gpu/vk/vk_replay.cppon top of main 51de681, unchanged from the reviewed version:present_defer_into,present_commit, andpresent_image's end aspresent_out, after main's device-loss check on the copy's submit.Validation:
test_present_ahead.pyandtest_present_semaphores.pyfail.Sorry for the trouble: the merge landed between the two commits.