VERY experimental Nintendo Switch 2 emulator
C++
[*] Remove Fix{Static,Small}VectorADL workaround for GCC 12 (#4386)
lizzie4dc69c06f764
diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cppindex f71a2df6be..f8946cc0f6 100644--- a/src/audio_core/in/audio_in_system.cpp+++ b/src/audio_core/in/audio_in_system.cpp@@ -14,21 +14,6 @@#include "core/core_timing.h"#include "core/hle/kernel/k_event.h"-// See texture_cache/util.h-template<typename T, size_t N>-#if BOOST_VERSION >= 108100 || __GNUC__ > 12-[[nodiscard]] boost::container::static_vector<T, N> FixStaticVectorADL(const boost::container::static_vector<T, N>& v) {- return v;-}-#else-[[nodiscard]] std::vector<T> FixStaticVectorADL(const boost::container::static_vector<T, N>& v) {- std::vector<T> u;- for (auto const& e : v)- u.push_back(e);- return u;-}-#endif-namespace AudioCore::AudioIn {System::System(Core::System& system_, Kernel::KEvent* event_, const size_t session_id_)@@ -110,7 +95,7 @@ Result System::Start() {boost::container::static_vector<AudioBuffer, BufferCount> buffers_to_flush{};buffers.RegisterBuffers(buffers_to_flush);- session->AppendBuffers(FixStaticVectorADL(buffers_to_flush));+ session->AppendBuffers(buffers_to_flush);session->SetRingSize(static_cast<u32>(buffers_to_flush.size()));return ResultSuccess;@@ -155,7 +140,7 @@ void System::RegisterBuffers() {if (state == State::Started) {boost::container::static_vector<AudioBuffer, BufferCount> registered_buffers{};buffers.RegisterBuffers(registered_buffers);- session->AppendBuffers(FixStaticVectorADL(registered_buffers));+ session->AppendBuffers(registered_buffers);}}diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.hindex 9a5d6f322a..53addb5dec 100644--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@ -1664,7 +1664,7 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,.size = overlap.SizeBytes(),});new_buffer.MarkUsage(copies[0].dst_offset, copies[0].size);- runtime.CopyBuffer(new_buffer, overlap, FixSmallVectorADL(copies), true);+ runtime.CopyBuffer(new_buffer, overlap, copies, true);#ifdef YUZU_LEGACYif (immediately_free)runtime.Finish();diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cppindex d5838a387d..8ffdcb6276 100644--- a/src/video_core/memory_manager.cpp+++ b/src/video_core/memory_manager.cpp@@ -713,7 +713,7 @@ void MemoryManager::FlushCaching() {if (accumulator.InvalidateAll([this](GPUVAddr addr, size_t size) {GetSubmappedRangeImpl<false>(addr, size, page_stash2);})) {- rasterizer->InnerInvalidation(VideoCommon::FixSmallVectorADL(page_stash2));+ rasterizer->InnerInvalidation(page_stash2);page_stash2.clear();}}diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex 1a33189bf8..493de2cc20 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -471,7 +471,7 @@ void BufferCacheRuntime::CopyBuffer(VkBuffer dst_buffer, VkBuffer src_buffer,if (src_buffer == staging_pool.StreamBuf() && can_reorder_upload) {scheduler.RecordWithUploadBuffer([src_buffer, dst_buffer, vk_copies](vk::CommandBuffer, vk::CommandBuffer upload_cmdbuf) {- upload_cmdbuf.CopyBuffer(src_buffer, dst_buffer, VideoCommon::FixSmallVectorADL(vk_copies));+ upload_cmdbuf.CopyBuffer(src_buffer, dst_buffer, vk_copies);});return;}@@ -482,7 +482,7 @@ void BufferCacheRuntime::CopyBuffer(VkBuffer dst_buffer, VkBuffer src_buffer,cmdbuf.PipelineBarrier(vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER,VK_PIPELINE_STAGE_TRANSFER_BIT, 0, READ_BARRIER);}- cmdbuf.CopyBuffer(src_buffer, dst_buffer, VideoCommon::FixSmallVectorADL(vk_copies));+ cmdbuf.CopyBuffer(src_buffer, dst_buffer, vk_copies);if (barrier) {cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,vk::PIPELINE_STAGE_GRAPHICS_COMPUTE, 0, WRITE_BARRIER);diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex bc2e82acae..583cb6edaf 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -1642,7 +1642,7 @@ void TextureCacheRuntime::CopyImage(Image& dst, Image& src,VK_PIPELINE_STAGE_TRANSFER_BIT,0, nullptr, nullptr, pre_barriers);cmdbuf.CopyImage(src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_image,- VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VideoCommon::FixSmallVectorADL(vk_copies));+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk_copies);cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |@@ -2006,7 +2006,7 @@ void Image::UploadMemory(VkBuffer buffer, VkDeviceSize offset,scheduler->Record([src_buffer, temp_vk_image, vk_aspect_mask,vk_copies](vk::CommandBuffer cmdbuf) {- CopyBufferToImage(cmdbuf, src_buffer, temp_vk_image, vk_aspect_mask, false, VideoCommon::FixSmallVectorADL(vk_copies));+ CopyBufferToImage(cmdbuf, src_buffer, temp_vk_image, vk_aspect_mask, false, vk_copies);});const auto [samples_x, samples_y] = VideoCommon::SamplesLog2(info.num_samples);@@ -2060,7 +2060,7 @@ void Image::UploadMemory(VkBuffer buffer, VkDeviceSize offset,scheduler->Record([src_buffer, vk_image, vk_aspect_mask, was_initialized,vk_copies](vk::CommandBuffer cmdbuf) {- CopyBufferToImage(cmdbuf, src_buffer, vk_image, vk_aspect_mask, was_initialized, VideoCommon::FixSmallVectorADL(vk_copies));+ CopyBufferToImage(cmdbuf, src_buffer, vk_image, vk_aspect_mask, was_initialized, vk_copies);});if (is_rescaled) {diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.hindex 640bd38407..e92e54f8ce 100644--- a/src/video_core/texture_cache/texture_cache.h+++ b/src/video_core/texture_cache/texture_cache.h@@ -140,7 +140,7 @@ void TextureCache<P>::RunGarbageCollector() {}if (must_download) {auto map = runtime.DownloadStagingBuffer(image.unswizzled_size_bytes);- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);image.DownloadMemory(map, copies);runtime.Finish();SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, map.mapped_span, swizzle_data_buffer);@@ -629,7 +629,7 @@ void TextureCache<P>::DownloadMemory(DAddr cpu_addr, size_t size) {for (const ImageId image_id : images) {Image& image = slot_images[image_id];auto map = runtime.DownloadStagingBuffer(image.unswizzled_size_bytes);- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);image.DownloadMemory(map, copies);runtime.Finish();SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, map.mapped_span,@@ -893,7 +893,7 @@ void TextureCache<P>::CommitAsyncFlushes() {for (const PendingDownload& download_info : download_ids) {if (download_info.is_swizzle) {Image& image = slot_images[download_info.object_id];- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);image.DownloadMemory(download_map, copies);download_map.offset += Common::AlignUp(image.unswizzled_size_bytes, 64);}@@ -926,7 +926,7 @@ void TextureCache<P>::PopAsyncFlushes() {auto& download_buffer = download_map[download_info.async_buffer_id];if (download_info.is_swizzle) {const ImageBase& image = slot_images[download_info.object_id];- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);download_buffer.offset -= Common::AlignUp(image.unswizzled_size_bytes, 64);std::span<u8> download_span =download_buffer.mapped_span.subspan(download_buffer.offset);@@ -964,7 +964,7 @@ void TextureCache<P>::PopAsyncFlushes() {continue;}Image& image = slot_images[download_info.object_id];- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);image.DownloadMemory(download_map, copies);download_map.offset += image.unswizzled_size_bytes;}@@ -977,7 +977,7 @@ void TextureCache<P>::PopAsyncFlushes() {continue;}const ImageBase& image = slot_images[download_info.object_id];- const auto copies = FixSmallVectorADL(FullDownloadCopies(image.info));+ const auto copies = FullDownloadCopies(image.info);SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span, swizzle_data_buffer);download_map.offset += image.unswizzled_size_bytes;download_span = download_span.subspan(image.unswizzled_size_bytes);@@ -1160,7 +1160,7 @@ void TextureCache<P>::UploadImageContents(Image& image, StagingBuffer& staging)gpu_memory->ReadBlock(gpu_addr, mapped_span.data(), mapped_span.size_bytes(),VideoCommon::CacheType::NoTextureCache);const auto uploads = FullUploadSwizzles(image.info);- runtime.AccelerateImageUpload(image, staging, FixSmallVectorADL(uploads), 0, 0);+ runtime.AccelerateImageUpload(image, staging, uploads, 0, 0);return;}@@ -1168,11 +1168,11 @@ void TextureCache<P>::UploadImageContents(Image& image, StagingBuffer& staging)*gpu_memory, gpu_addr, image.guest_size_bytes, &swizzle_data_buffer);if (True(image.flags & ImageFlagBits::Converted)) {unswizzle_data_buffer.resize_destructive(image.unswizzled_size_bytes);- auto copies = FixSmallVectorADL(UnswizzleImage(*gpu_memory, gpu_addr, image.info, swizzle_data, unswizzle_data_buffer));+ auto copies = UnswizzleImage(*gpu_memory, gpu_addr, image.info, swizzle_data, unswizzle_data_buffer);ConvertImage(unswizzle_data_buffer, image.info, mapped_span, copies);image.UploadMemory(staging, copies);} else {- const auto copies = FixSmallVectorADL(UnswizzleImage(*gpu_memory, gpu_addr, image.info, swizzle_data, mapped_span));+ const auto copies = UnswizzleImage(*gpu_memory, gpu_addr, image.info, swizzle_data, mapped_span);image.UploadMemory(staging, copies);}}@@ -1401,7 +1401,7 @@ void TextureCache<P>::TickAsyncDecode() {auto staging = runtime.UploadStagingBuffer(MapSizeBytes(image));std::memcpy(staging.mapped_span.data(), async_decode->decoded_data.data(),async_decode->decoded_data.size());- image.UploadMemory(staging, FixSmallVectorADL(async_decode->copies));+ image.UploadMemory(staging, async_decode->copies);image.flags &= ~ImageFlagBits::IsDecoding;has_uploads = true;i = async_decodes.erase(i);@@ -1469,7 +1469,7 @@ void TextureCache<P>::TickAsyncUnswizzle() {if (z_count > 0) {const auto uploads = FullUploadSwizzles(task.info);- runtime.AccelerateImageUpload(image, task.staging_buffer, FixSmallVectorADL(uploads), z_start, z_count);+ runtime.AccelerateImageUpload(image, task.staging_buffer, uploads, z_start, z_count);task.last_submitted_offset += (static_cast<size_t>(z_count) * task.bytes_per_slice);}}@@ -1730,9 +1730,9 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, DAconst u32 down_shift = can_rescale ? resolution.down_shift : 0;auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift);if (overlap.info.num_samples != new_image.info.num_samples) {- runtime.CopyImageMSAA(new_image, overlap, FixSmallVectorADL(copies));+ runtime.CopyImageMSAA(new_image, overlap, copies);} else {- runtime.CopyImage(new_image, overlap, FixSmallVectorADL(copies));+ runtime.CopyImage(new_image, overlap, copies);}new_image.modification_tick = overlap.modification_tick;}diff --git a/src/video_core/texture_cache/util.h b/src/video_core/texture_cache/util.hindex 3e8bb00032..590d85b042 100644--- a/src/video_core/texture_cache/util.h+++ b/src/video_core/texture_cache/util.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project@@ -122,25 +122,4 @@ void DeduceBlitImages(ImageInfo& dst_info, ImageInfo& src_info, const ImageBase*[[nodiscard]] u32 MapSizeBytes(const ImageBase& image);-// TODO: Remove once Debian STABLE no longer has such outdated boost-// This is a gcc bug where ADL lookup fails for range niebloids of std::span<T>-// for any given type of the static_vector/small_vector, etc which makes a whole mess-// for anything using std::span<T> so we just do this terrible hack on older versions of-// GCC12 because people actually still use stable debian so... yeah-// One may say: "This is bad for performance" - to which I say, using GCC 12 you already know-// what kind of bs you will be dealing with anyways.-template<typename T, size_t N>-#if BOOST_VERSION >= 108100 || __GNUC__ > 12-[[nodiscard]] boost::container::small_vector<T, N> FixSmallVectorADL(const boost::container::small_vector<T, N>& v) {- return v;-}-#else-[[nodiscard]] std::vector<T> FixSmallVectorADL(const boost::container::small_vector<T, N>& v) {- std::vector<T> u;- for (auto const& e : v)- u.push_back(e);- return u;-}-#endif-} // namespace VideoCommon