dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-04-29 23:41:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Vulkan device sorting logic violating strict weak ordering (#4322)

Browse Source
This commit is contained in:
Jun-Hong Cheng 2026-04-26 04:57:00 +08:00 committed by GitHub
parent 47f5cc1437
commit a762f70df3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/video_core/renderer_vulkan/vk_instance.cpp
View File

@ -116,13 +116,20 @@ Instance::Instance(Frontend::WindowSDL& window, s32 physical_device_index,
std::sort(properties2.begin(), properties2.end(), [](const auto& left, const auto& right) {
const vk::PhysicalDeviceProperties& left_prop = std::get<1>(left).properties;
const vk::PhysicalDeviceProperties& right_prop = std::get<1>(right).properties;
if (left_prop.apiVersion >= TargetVulkanApiVersion &&
right_prop.apiVersion < TargetVulkanApiVersion) {
return true;
const bool left_supports_api = left_prop.apiVersion >= TargetVulkanApiVersion;
const bool right_supports_api = right_prop.apiVersion >= TargetVulkanApiVersion;
if (left_supports_api != right_supports_api) {
return left_supports_api;
}
if (left_prop.deviceType != right_prop.deviceType) {
return left_prop.deviceType == vk::PhysicalDeviceType::eDiscreteGpu;
const bool left_is_discrete =
left_prop.deviceType == vk::PhysicalDeviceType::eDiscreteGpu;
const bool right_is_discrete =
right_prop.deviceType == vk::PhysicalDeviceType::eDiscreteGpu;
if (left_is_discrete != right_is_discrete) {
return left_is_discrete;
}
constexpr auto get_mem = [](const vk::PhysicalDeviceMemoryProperties& mem) -> size_t {
size_t max = 0;
for (u32 i = 0; i < mem.memoryHeapCount; i++) {