Merge branch 'shadps4-emu:main' into qt-style

This commit is contained in:
tomboylover93 2024-12-18 11:45:48 -03:00 committed by GitHub
commit 73a9bcd901
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -583,23 +583,20 @@ bool Instance::IsFormatSupported(const vk::Format format,
return (GetFormatFeatureFlags(format) & flags) == flags; return (GetFormatFeatureFlags(format) & flags) == flags;
} }
static vk::Format GetAlternativeFormat(const vk::Format format) {
switch (format) {
case vk::Format::eD16UnormS8Uint:
return vk::Format::eD24UnormS8Uint;
default:
return format;
}
}
vk::Format Instance::GetSupportedFormat(const vk::Format format, vk::Format Instance::GetSupportedFormat(const vk::Format format,
const vk::FormatFeatureFlags2 flags) const { const vk::FormatFeatureFlags2 flags) const {
if (IsFormatSupported(format, flags)) [[likely]] { if (!IsFormatSupported(format, flags)) [[unlikely]] {
return format; switch (format) {
} case vk::Format::eD16UnormS8Uint:
const vk::Format alternative = GetAlternativeFormat(format); if (IsFormatSupported(vk::Format::eD24UnormS8Uint, flags)) {
if (IsFormatSupported(alternative, flags)) [[likely]] { return vk::Format::eD24UnormS8Uint;
return alternative; }
if (IsFormatSupported(vk::Format::eD32SfloatS8Uint, flags)) {
return vk::Format::eD32SfloatS8Uint;
}
default:
break;
}
} }
return format; return format;
} }