VERY experimental Nintendo Switch 2 emulator
C++
renderer_vulkan: Add support for VK_KHR_image_format_list
GPUCodeb7e726669e4f
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex 8385b5509d..f1b696e01e 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -36,8 +36,10 @@ using VideoCommon::ImageFlagBits;using VideoCommon::ImageInfo;using VideoCommon::ImageType;using VideoCommon::SubresourceRange;+using VideoCore::Surface::BytesPerBlock;using VideoCore::Surface::IsPixelFormatASTC;using VideoCore::Surface::IsPixelFormatInteger;+using VideoCore::Surface::SurfaceType;namespace {constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {@@ -130,7 +132,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {[[nodiscard]] VkImageCreateInfo MakeImageCreateInfo(const Device& device, const ImageInfo& info) {const PixelFormat format = StorageFormat(info.format);const auto format_info = MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, format);- VkImageCreateFlags flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;+ VkImageCreateFlags flags{};if (info.type == ImageType::e2D && info.resources.layers >= 6 &&info.size.width == info.size.height && !device.HasBrokenCubeImageCompability()) {flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;@@ -163,11 +165,24 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {}[[nodiscard]] vk::Image MakeImage(const Device& device, const MemoryAllocator& allocator,- const ImageInfo& info) {+ const ImageInfo& info, std::span<const VkFormat> view_formats) {if (info.type == ImageType::Buffer) {return vk::Image{};}- return allocator.CreateImage(MakeImageCreateInfo(device, info));+ VkImageCreateInfo image_ci = MakeImageCreateInfo(device, info);+ const VkImageFormatListCreateInfo image_format_list = {+ .sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO,+ .pNext = nullptr,+ .viewFormatCount = static_cast<u32>(view_formats.size()),+ .pViewFormats = view_formats.data(),+ };+ if (view_formats.size() > 1) {+ image_ci.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;+ if (device.IsKhrImageFormatListSupported()) {+ image_ci.pNext = &image_format_list;+ }+ }+ return allocator.CreateImage(image_ci);}[[nodiscard]] VkImageAspectFlags ImageAspectMask(PixelFormat format) {@@ -806,6 +821,24 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& schedastc_decoder_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,compute_pass_descriptor_queue, memory_allocator);}+ if (!device.IsKhrImageFormatListSupported()) {+ return;+ }+ for (size_t index_a = 0; index_a < VideoCore::Surface::MaxPixelFormat; index_a++) {+ const auto image_format = static_cast<PixelFormat>(index_a);+ const auto type_a = VideoCore::Surface::GetFormatType(image_format);+ if (type_a != SurfaceType::ColorTexture) {+ continue;+ }+ for (size_t index_b = 0; index_b < VideoCore::Surface::MaxPixelFormat; index_b++) {+ const auto view_format = static_cast<PixelFormat>(index_b);+ if (VideoCore::Surface::IsViewCompatible(image_format, view_format, false, true)) {+ const auto view_info =+ MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, view_format);+ view_formats[index_a].push_back(view_info.format);+ }+ }+ }}void TextureCacheRuntime::Finish() {@@ -1265,8 +1298,8 @@ void TextureCacheRuntime::TickFrame() {}Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu_addr_,VAddr cpu_addr_): VideoCommon::ImageBase(info_, gpu_addr_, cpu_addr_), scheduler{&runtime_.scheduler},- runtime{&runtime_},- original_image(MakeImage(runtime_.device, runtime_.memory_allocator, info)),+ runtime{&runtime_}, original_image(MakeImage(runtime_.device, runtime_.memory_allocator, info,+ runtime->ViewFormats(info.format))),aspect_mask(ImageAspectMask(info.format)) {if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) {if (Settings::values.async_astc.GetValue()) {@@ -1471,7 +1504,8 @@ bool Image::ScaleUp(bool ignore) {auto scaled_info = info;scaled_info.size.width = scaled_width;scaled_info.size.height = scaled_height;- scaled_image = MakeImage(runtime->device, runtime->memory_allocator, scaled_info);+ scaled_image = MakeImage(runtime->device, runtime->memory_allocator, scaled_info,+ runtime->ViewFormats(info.format));ignore = false;}current_image = *scaled_image;diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.hindex 220943116f..6621210ea6 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.h+++ b/src/video_core/renderer_vulkan/vk_texture_cache.h@@ -103,6 +103,10 @@ public:[[nodiscard]] VkBuffer GetTemporaryBuffer(size_t needed_size);+ std::span<const VkFormat> ViewFormats(PixelFormat format) {+ return view_formats[static_cast<std::size_t>(format)];+ }+void BarrierFeedbackLoop();const Device& device;@@ -113,6 +117,7 @@ public:RenderPassCache& render_pass_cache;std::optional<ASTCDecoderPass> astc_decoder_pass;const Settings::ResolutionScalingInfo& resolution;+ std::array<std::vector<VkFormat>, VideoCore::Surface::MaxPixelFormat> view_formats;static constexpr size_t indexing_slots = 8 * sizeof(size_t);std::array<vk::Buffer, indexing_slots> buffers{};diff --git a/src/video_core/texture_cache/types.h b/src/video_core/texture_cache/types.hindex a0e10643f3..0453456b4b 100644--- a/src/video_core/texture_cache/types.h+++ b/src/video_core/texture_cache/types.h@@ -54,7 +54,6 @@ enum class RelaxedOptions : u32 {Format = 1 << 1,Samples = 1 << 2,ForceBrokenViews = 1 << 3,- FormatBpp = 1 << 4,};DECLARE_ENUM_FLAG_OPERATORS(RelaxedOptions)diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cppindex 9a618a57a1..0de6ed09d9 100644--- a/src/video_core/texture_cache/util.cpp+++ b/src/video_core/texture_cache/util.cpp@@ -1201,8 +1201,7 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const// Format checking is relaxed, but we still have to check for matching bytes per block.// This avoids creating a view for blits on UE4 titles where formats with different bytes// per block are aliased.- if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format) &&- False(options & RelaxedOptions::FormatBpp)) {+ if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format)) {return std::nullopt;}} else {@@ -1233,11 +1232,7 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const}const bool strict_size = False(options & RelaxedOptions::Size);if (!IsBlockLinearSizeCompatible(existing, candidate, base->level, 0, strict_size)) {- if (False(options & RelaxedOptions::FormatBpp)) {- return std::nullopt;- } else if (!IsBlockLinearSizeCompatibleBPPRelaxed(existing, candidate, base->level, 0)) {- return std::nullopt;- }+ return std::nullopt;}// TODO: compare block sizesreturn base;diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 1f17265d52..3ace1fb03f 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -77,6 +77,7 @@ VK_DEFINE_HANDLE(VmaAllocator)EXTENSION(KHR, SPIRV_1_4, spirv_1_4) \EXTENSION(KHR, SWAPCHAIN, swapchain) \EXTENSION(KHR, SWAPCHAIN_MUTABLE_FORMAT, swapchain_mutable_format) \+ EXTENSION(KHR, IMAGE_FORMAT_LIST, image_format_list) \EXTENSION(NV, DEVICE_DIAGNOSTICS_CONFIG, device_diagnostics_config) \EXTENSION(NV, GEOMETRY_SHADER_PASSTHROUGH, geometry_shader_passthrough) \EXTENSION(NV, VIEWPORT_ARRAY2, viewport_array2) \@@ -408,6 +409,11 @@ public:return extensions.workgroup_memory_explicit_layout;}+ /// Returns true if the device supports VK_KHR_image_format_list.+ bool IsKhrImageFormatListSupported() const {+ return extensions.image_format_list || instance_version >= VK_API_VERSION_1_2;+ }+/// Returns true if the device supports VK_EXT_primitive_topology_list_restart.bool IsTopologyListPrimitiveRestartSupported() const {return features.primitive_topology_list_restart.primitiveTopologyListRestart;