mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-10 05:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: Add present mode option. (#3502)

Browse Source 
* config: Add present mode option.

* settings_dialog: Add details for present modes.
This commit is contained in:
squidbus
2025-09-01 16:42:31 -07:00
committed by GitHub
parent f09c0e5a28
commit 9246b4277b
6 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/video_core/renderer_vulkan/vk_swapchain.cpp
View File

@@ -21,6 +21,7 @@ static constexpr vk::SurfaceFormatKHR SURFACE_FORMAT_HDR = {
Swapchain::Swapchain(const Instance& instance_, const Frontend::WindowSDL& window_)
: instance{instance_}, window{window_}, surface{CreateSurface(instance.GetInstance(), window)} {
FindPresentFormat();
FindPresentMode();
Create(window.GetWidth(), window.GetHeight());
ImGui::Core::Initialize(instance, window, image_count, surface_format.format);
@@ -45,20 +46,6 @@ void Swapchain::Create(u32 width_, u32 height_) {
instance.GetPresentQueueFamilyIndex(),
};
const auto [modes_result, modes] =
instance.GetPhysicalDevice().getSurfacePresentModesKHR(surface);
const auto find_mode = [&modes_result, &modes](vk::PresentModeKHR requested) {
if (modes_result != vk::Result::eSuccess) {
return false;
}
const auto it =
std::find_if(modes.begin(), modes.end(),
[&requested](vk::PresentModeKHR mode) { return mode == requested; });
return it != modes.cend();
};
const bool has_mailbox = find_mode(vk::PresentModeKHR::eMailbox);
const bool exclusive = queue_family_indices[0] == queue_family_indices[1];
const u32 queue_family_indices_count = exclusive ? 1u : 2u;
const vk::SharingMode sharing_mode =
@@ -78,7 +65,7 @@ void Swapchain::Create(u32 width_, u32 height_) {
.pQueueFamilyIndices = queue_family_indices.data(),
.preTransform = transform,
.compositeAlpha = composite_alpha,
.presentMode = has_mailbox ? vk::PresentModeKHR::eMailbox : vk::PresentModeKHR::eImmediate,
.presentMode = present_mode,
.clipped = true,
.oldSwapchain = nullptr,
};
@@ -202,6 +189,38 @@ void Swapchain::FindPresentFormat() {
UNREACHABLE_MSG("Unable to find required swapchain format!");
}
void Swapchain::FindPresentMode() {
const auto [modes_result, modes] =
instance.GetPhysicalDevice().getSurfacePresentModesKHR(surface);
if (modes_result != vk::Result::eSuccess) {
LOG_ERROR(Render, "Failed to query available present modes, falling back to Fifo as "
"guaranteed supported option.");
present_mode = vk::PresentModeKHR::eFifo;
return;
}
const auto requested_mode = Config::getPresentMode();
if (requested_mode == "Mailbox") {
present_mode = vk::PresentModeKHR::eMailbox;
} else if (requested_mode == "Fifo") {
present_mode = vk::PresentModeKHR::eFifo;
} else if (requested_mode == "Immediate") {
present_mode = vk::PresentModeKHR::eImmediate;
} else {
LOG_ERROR(Render_Vulkan, "Unknown present mode {}, defaulting to Mailbox.",
Config::getPresentMode());
present_mode = vk::PresentModeKHR::eMailbox;
}
if (std::ranges::find(modes, present_mode) == modes.cend()) {
// FIFO is guaranteed to be supported by the Vulkan spec.
constexpr auto fallback = vk::PresentModeKHR::eFifo;
LOG_WARNING(Render, "Requested present mode {} is not supported, falling back to {}.",
vk::to_string(present_mode), vk::to_string(fallback));
present_mode = fallback;
}
}
void Swapchain::SetSurfaceProperties() {
const auto [capabilities_result, capabilities] =
instance.GetPhysicalDevice().getSurfaceCapabilitiesKHR(surface);

4
src/video_core/renderer_vulkan/vk_swapchain.h
View File

@@ -96,6 +96,9 @@ private:
/// Selects the best available swapchain image format
void FindPresentFormat();
/// Selects the best available present mode
void FindPresentMode();
/// Sets the surface properties according to device capabilities
void SetSurfaceProperties();
@@ -115,6 +118,7 @@ private:
vk::SurfaceKHR surface{};
vk::SurfaceFormatKHR surface_format;
vk::Format view_format;
vk::PresentModeKHR present_mode;
vk::Extent2D extent;
vk::SurfaceTransformFlagBitsKHR transform;
vk::CompositeAlphaFlagBitsKHR composite_alpha;