VERY experimental Nintendo Switch 2 emulator
C++
general: Resolve -Wunused-lambda-capture and C5233
Morphc6c56d3e9caf
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cppindex f23d9373bd..5d02865f43 100644--- a/src/core/file_sys/card_image.cpp+++ b/src/core/file_sys/card_image.cpp@@ -232,8 +232,8 @@ const std::vector<std::shared_ptr<NCA>>& XCI::GetNCAs() const {std::shared_ptr<NCA> XCI::GetNCAByType(NCAContentType type) const {const auto program_id = secure_partition->GetProgramTitleID();- const auto iter = std::find_if(- ncas.begin(), ncas.end(), [this, type, program_id](const std::shared_ptr<NCA>& nca) {+ const auto iter =+ std::find_if(ncas.begin(), ncas.end(), [type, program_id](const std::shared_ptr<NCA>& nca) {return nca->GetType() == type && nca->GetTitleId() == program_id;});return iter == ncas.end() ? nullptr : *iter;diff --git a/src/core/memory.cpp b/src/core/memory.cppindex 9637cb5b1e..3ca80c8ff0 100644--- a/src/core/memory.cpp+++ b/src/core/memory.cpp@@ -233,18 +233,17 @@ struct Memory::Impl {current_vaddr, src_addr, size);std::memset(dest_buffer, 0, copy_amount);},- [&dest_buffer](const std::size_t copy_amount, const u8* const src_ptr) {+ [&](const std::size_t copy_amount, const u8* const src_ptr) {std::memcpy(dest_buffer, src_ptr, copy_amount);},- [&system = system, &dest_buffer](const VAddr current_vaddr,- const std::size_t copy_amount,- const u8* const host_ptr) {+ [&](const VAddr current_vaddr, const std::size_t copy_amount,+ const u8* const host_ptr) {if constexpr (!UNSAFE) {system.GPU().FlushRegion(current_vaddr, copy_amount);}std::memcpy(dest_buffer, host_ptr, copy_amount);},- [&dest_buffer](const std::size_t copy_amount) {+ [&](const std::size_t copy_amount) {dest_buffer = static_cast<u8*>(dest_buffer) + copy_amount;});}@@ -267,17 +266,16 @@ struct Memory::Impl {"Unmapped WriteBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})",current_vaddr, dest_addr, size);},- [&src_buffer](const std::size_t copy_amount, u8* const dest_ptr) {+ [&](const std::size_t copy_amount, u8* const dest_ptr) {std::memcpy(dest_ptr, src_buffer, copy_amount);},- [&system = system, &src_buffer](const VAddr current_vaddr,- const std::size_t copy_amount, u8* const host_ptr) {+ [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) {if constexpr (!UNSAFE) {system.GPU().InvalidateRegion(current_vaddr, copy_amount);}std::memcpy(host_ptr, src_buffer, copy_amount);},- [&src_buffer](const std::size_t copy_amount) {+ [&](const std::size_t copy_amount) {src_buffer = static_cast<const u8*>(src_buffer) + copy_amount;});}@@ -301,8 +299,7 @@ struct Memory::Impl {[](const std::size_t copy_amount, u8* const dest_ptr) {std::memset(dest_ptr, 0, copy_amount);},- [&system = system](const VAddr current_vaddr, const std::size_t copy_amount,- u8* const host_ptr) {+ [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) {system.GPU().InvalidateRegion(current_vaddr, copy_amount);std::memset(host_ptr, 0, copy_amount);},@@ -313,22 +310,20 @@ struct Memory::Impl {const std::size_t size) {WalkBlock(process, dest_addr, size,- [this, &process, &dest_addr, &src_addr, size](const std::size_t copy_amount,- const VAddr current_vaddr) {+ [&](const std::size_t copy_amount, const VAddr current_vaddr) {LOG_ERROR(HW_Memory,"Unmapped CopyBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})",current_vaddr, src_addr, size);ZeroBlock(process, dest_addr, copy_amount);},- [this, &process, &dest_addr](const std::size_t copy_amount, const u8* const src_ptr) {+ [&](const std::size_t copy_amount, const u8* const src_ptr) {WriteBlockImpl<false>(process, dest_addr, src_ptr, copy_amount);},- [this, &system = system, &process, &dest_addr](- const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) {+ [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) {system.GPU().FlushRegion(current_vaddr, copy_amount);WriteBlockImpl<false>(process, dest_addr, host_ptr, copy_amount);},- [&dest_addr, &src_addr](const std::size_t copy_amount) {+ [&](const std::size_t copy_amount) {dest_addr += static_cast<VAddr>(copy_amount);src_addr += static_cast<VAddr>(copy_amount);});@@ -575,7 +570,7 @@ struct Memory::Impl {[vaddr]() {LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8, vaddr);},- [&system = system, vaddr]() { system.GPU().FlushRegion(vaddr, sizeof(T)); });+ [&]() { system.GPU().FlushRegion(vaddr, sizeof(T)); });if (ptr) {std::memcpy(&result, ptr, sizeof(T));}@@ -599,7 +594,7 @@ struct Memory::Impl {LOG_ERROR(HW_Memory, "Unmapped Write{} @ 0x{:016X} = 0x{:016X}", sizeof(T) * 8,vaddr, static_cast<u64>(data));},- [&system = system, vaddr]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); });+ [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); });if (ptr) {std::memcpy(ptr, &data, sizeof(T));}@@ -613,7 +608,7 @@ struct Memory::Impl {LOG_ERROR(HW_Memory, "Unmapped WriteExclusive{} @ 0x{:016X} = 0x{:016X}",sizeof(T) * 8, vaddr, static_cast<u64>(data));},- [&system = system, vaddr]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); });+ [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); });if (ptr) {const auto volatile_pointer = reinterpret_cast<volatile T*>(ptr);return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);@@ -628,7 +623,7 @@ struct Memory::Impl {LOG_ERROR(HW_Memory, "Unmapped WriteExclusive128 @ 0x{:016X} = 0x{:016X}{:016X}",vaddr, static_cast<u64>(data[1]), static_cast<u64>(data[0]));},- [&system = system, vaddr]() { system.GPU().InvalidateRegion(vaddr, sizeof(u128)); });+ [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(u128)); });if (ptr) {const auto volatile_pointer = reinterpret_cast<volatile u64*>(ptr);return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.hindex 0e0fd410f8..8ef75fe734 100644--- a/src/video_core/texture_cache/texture_cache.h+++ b/src/video_core/texture_cache/texture_cache.h@@ -442,7 +442,7 @@ void TextureCache<P>::WriteMemory(VAddr cpu_addr, size_t size) {template <class P>void TextureCache<P>::DownloadMemory(VAddr cpu_addr, size_t size) {std::vector<ImageId> images;- ForEachImageInRegion(cpu_addr, size, [this, &images](ImageId image_id, ImageBase& image) {+ ForEachImageInRegion(cpu_addr, size, [&images](ImageId image_id, ImageBase& image) {if (!image.IsSafeDownload()) {return;}@@ -1502,9 +1502,9 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {image.flags &= ~ImageFlagBits::BadOverlap;lru_cache.Free(image.lru_index);const auto& clear_page_table =- [this, image_id](u64 page,- std::unordered_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&- selected_page_table) {+ [image_id](u64 page,+ std::unordered_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&+ selected_page_table) {const auto page_it = selected_page_table.find(page);if (page_it == selected_page_table.end()) {ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS);diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cppindex 15b9d4182b..69a32819a5 100644--- a/src/video_core/textures/astc.cpp+++ b/src/video_core/textures/astc.cpp@@ -1661,8 +1661,8 @@ void Decompress(std::span<const uint8_t> data, uint32_t width, uint32_t height,for (u32 z = 0; z < depth; ++z) {const u32 depth_offset = z * height * width * 4;for (u32 y_index = 0; y_index < rows; ++y_index) {- auto decompress_stride = [data, width, height, depth, block_width, block_height, output,- rows, cols, z, depth_offset, y_index] {+ auto decompress_stride = [data, width, height, block_width, block_height, output, rows,+ cols, z, depth_offset, y_index] {const u32 y = y_index * block_height;for (u32 x_index = 0; x_index < cols; ++x_index) {const u32 block_index = (z * rows * cols) + (y_index * cols) + x_index;