Skip to content

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
NotRexed:mainfrom
mayathaim-hue:fix/present-ahead
Closed

mayathaim-hue wants to merge 2 commits into
NotRexed:mainfrom
mayathaim-hue:fix/present-ahead

Conversation

@mayathaim-hue

Copy link
Copy Markdown
Contributor

#1720 was merged at a259978, a one-step commit on its branch where gpu/vk/vk_replay.cpp was 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 has vk_framegen.cpp calling present_commit and using present_defer_into, which nothing defines (an unresolved link on every build), and tests/test_present_ahead.py and tests/test_present_semaphores.py fail.

This puts back the missing 24 lines in gpu/vk/vk_replay.cpp on top of main 51de681, unchanged from the reviewed version: present_defer_into, present_commit, and present_image's end as present_out, after main's device-loss check on the copy's submit.

Validation:

  • The same 24 lines as the version reviewed and tested in fix(vk): submit a 2x set's copies together so its presents keep their times #1720 (there resolved against b2ed731 and run in game).
  • 27 related checks pass on this branch with LLVM-MinGW on Windows (present ahead, present semaphores, framegen gate / auto / preset, frame wait bounds, device lost exit, capture, flash sampling, framelog, Reflex swapchain lifetime, swapchain compat and colorspace, parallel). On main 51de681, test_present_ahead.py and test_present_semaphores.py fail.

Sorry for the trouble: the merge landed between the two commits.

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.
@mayathaim-hue

Copy link
Copy Markdown
Contributor Author

Closing in favour of #1858, which puts back the same 24 lines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant