I think something like https://gitlab.winehq.org/rbernon/wine/-/commit/1314374cf82a972e0bdf688e6b53... on top of https://gitlab.winehq.org/wine/wine/-/merge_requests/5465 should do the trick and will allow us to move vkQueuePresent WSI logic entirely out of the drivers.