mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-01 12:46:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

vulkan: Upgrade format queries to use format feature flags 2. (#941)
Some checks are pending
Reuse / reuse (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
Linux-Qt / build (push) Waiting to run
Details
Linux / build (push) Waiting to run
Details
macOS-Qt / build (push) Waiting to run
Details
macOS / build (push) Waiting to run
Details
Windows-Qt / build (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details

Browse source
This commit is contained in:
squidbus 2024-09-20 14:05:16 -07:00 committed by GitHub
parent c3d5824279
commit eaa92b5a65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/video_core/renderer_vulkan/vk_instance.cpp
View file

@ -33,11 +33,16 @@ std::vector<std::string> GetSupportedExtensions(vk::PhysicalDevice physical) {
return supported_extensions; return supported_extensions;
} }
std::unordered_map<vk::Format, vk::FormatProperties> GetFormatProperties( std::unordered_map<vk::Format, vk::FormatProperties3> GetFormatProperties(
vk::PhysicalDevice physical) { vk::PhysicalDevice physical) {
std::unordered_map<vk::Format, vk::FormatProperties> format_properties; std::unordered_map<vk::Format, vk::FormatProperties3> format_properties;
for (const auto& format : LiverpoolToVK::GetAllFormats()) { for (const auto& format : LiverpoolToVK::GetAllFormats()) {
format_properties.emplace(format, physical.getFormatProperties(format)); vk::FormatProperties3 properties3{};
vk::FormatProperties2 properties2 = {
.pNext = &properties3,
};
physical.getFormatProperties2(format, &properties2);
format_properties.emplace(format, properties3);
} }
return format_properties; return format_properties;
} }
@ -496,9 +501,9 @@ bool Instance::IsImageFormatSupported(const vk::Format format) const {
UNIMPLEMENTED_MSG("Properties of format {} have not been queried.", vk::to_string(format)); UNIMPLEMENTED_MSG("Properties of format {} have not been queried.", vk::to_string(format));
} }
constexpr vk::FormatFeatureFlags optimal_flags = vk::FormatFeatureFlagBits::eTransferSrc | constexpr vk::FormatFeatureFlags2 optimal_flags = vk::FormatFeatureFlagBits2::eTransferSrc |
vk::FormatFeatureFlagBits::eTransferDst | vk::FormatFeatureFlagBits2::eTransferDst |
vk::FormatFeatureFlagBits::eSampledImage; vk::FormatFeatureFlagBits2::eSampledImage;
return (it->second.optimalTilingFeatures & optimal_flags) == optimal_flags; return (it->second.optimalTilingFeatures & optimal_flags) == optimal_flags;
} }
@ -512,7 +517,7 @@ bool Instance::IsVertexFormatSupported(const vk::Format format) const {
UNIMPLEMENTED_MSG("Properties of format {} have not been queried.", vk::to_string(format)); UNIMPLEMENTED_MSG("Properties of format {} have not been queried.", vk::to_string(format));
} }
constexpr vk::FormatFeatureFlags optimal_flags = vk::FormatFeatureFlagBits::eVertexBuffer; constexpr vk::FormatFeatureFlags2 optimal_flags = vk::FormatFeatureFlagBits2::eVertexBuffer;
return (it->second.bufferFeatures & optimal_flags) == optimal_flags; return (it->second.bufferFeatures & optimal_flags) == optimal_flags;
} }

2
src/video_core/renderer_vulkan/vk_instance.h
View file

@ -264,7 +264,7 @@ private:
vk::Queue graphics_queue; vk::Queue graphics_queue;
std::vector<vk::PhysicalDevice> physical_devices; std::vector<vk::PhysicalDevice> physical_devices;
std::vector<std::string> available_extensions; std::vector<std::string> available_extensions;
std::unordered_map<vk::Format, vk::FormatProperties> format_properties; std::unordered_map<vk::Format, vk::FormatProperties3> format_properties;
TracyVkCtx profiler_context{}; TracyVkCtx profiler_context{};
u32 queue_family_index{0}; u32 queue_family_index{0};
bool image_view_reinterpretation{true}; bool image_view_reinterpretation{true};