Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework swapchain management #4609

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Rework swapchain management #4609

wants to merge 22 commits into from
+1,583 −898

Conversation

doitsujin
Copy link
Owner

@doitsujin doitsujin commented Jan 13, 2025 •
edited
Loading

Big refactor that moves a lot of responsibility to the backend, where it should have been in the first place.

Key changes:

  • Vulkan surface and swapchain creation now happens entirely in the backend. Instead of this clusterfuck where the front-end needs to manually synchronize everything through four different threads and then pray that it actually works, we now just set swapchain properties via a bunch of functions that can then get applied during the next acquireNextImage call.
  • Enabled automatic conversion between HDR10 and scRGB color spaces if the system only supports one of those and the game uses the other. This is definitely not well tested with actual HDR content though.
  • Fixed broken blending with the HUD and software cursor in non-linear color spaces (sRGB if the image format is non-sRGB; HDR10)

Needs lots of testing, especially in D3D9 apps since there are so many weird edge cases wrt swapchain usage.

@doitsujin doitsujin force-pushed the swapchain-rework branch 5 times, most recently from cb57e40 to 22ccf41 Compare January 13, 2025 14:15
@doitsujin doitsujin marked this pull request as ready for review January 13, 2025 16:08
@doitsujin
[dxvk] Move surface creation to the backend
e52f066
@doitsujin
[dxvk] Import swap chain images from the back-end
220b38e
@doitsujin
[dxvk] Move deferSurfaceCreation handling to backend
ef51c4f
@doitsujin
[dxvk] Rework HDR metadata updates
9764a17
@doitsujin
[dxvk] Move Vulkan swapchain management to backend
36ae422 
Massive cleanup reduce code duplication between D3D11 and D3D9,
and introduce a sane path to pass data around. Implicit swap
chain recreation is now entirely transparent to the frontends.
@doitsujin
[dxvk] Add color space property to image description
57c6c5e
@doitsujin
[dxvk] Don't redundantly update image debug names
e69f740
@doitsujin
[dxvk] Set color space for swap chain back buffers
dfbfd67
@doitsujin
[d3d11] Set color space for swap chain image
a38d910
@doitsujin
[d3d9] Set color space for swap chain image
41fcc8f
@doitsujin
[dxvk] Infer swap chain color space from image views
b5be1ff
@doitsujin doitsujin mentioned this pull request Jan 13, 2025
Open
@doitsujin
[dxvk] Enable automatic fallbacks for HDR color spaces
406c9c2 
The swap chain blitter can deal with the conversion.
@doitsujin
[hud] Allow returning HUD item objects to the caller
49c053c
@doitsujin
[hud] Add function to change API name dynamically
7917ad1 
Needed for D3D8 due to implicit swapchain shenanigans.
@doitsujin
[dxvk] Move HUD update and rendering into swapchain blitter
764eb81
@doitsujin
[hud] Add method to check whether HUD is empty
93bd48a
@doitsujin
[dxvk] Prepare swapchain blitter for compositing HUD and cursor
1d6ead6 
This will be necessary for non-linear color spaces to get proper blending.
@doitsujin
[dxvk] Rework swapchain composition
317828c 
Also adds a separate set of shaders for the software cursor, provided it
can be drawn directly with alpha blending.
@doitsujin
[dxvk] Adjust swapchain format preferences in various cases
f59cbf9 
For sRGB, using a native sRGB format allows the swapchain blitter
to use a more efficient code path for drawing the HUD.

Also allow RGB9E5 for sRGB and HDR10.
@doitsujin
[d3d9,d3d11] Remove numBackBuffers option
bc9c123 
Useless.
@doitsujin
[dxvk] Dirty swapchain if present returns SUBOPTIMAL
c6a21f5 
May fix some issues in case the WSI implementation can return SUBOPTIMAL
from present but not acquire. Also ensure to keep state consistent.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@doitsujin