summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Morph2022-10-21 02:34:07 -0400
committerGravatar Morph2022-10-22 15:02:04 -0400
commitc7e079a5d441840e1ae2aabd5be0f45ffb737f1c (patch)
treed8d4f64d081a910aa8364fdf65ac32ab10bc4ab6 /src/video_core
parentgeneral: Resolve -Wclass-memaccess (diff)
downloadyuzu-c7e079a5d441840e1ae2aabd5be0f45ffb737f1c.tar.gz
yuzu-c7e079a5d441840e1ae2aabd5be0f45ffb737f1c.tar.xz
yuzu-c7e079a5d441840e1ae2aabd5be0f45ffb737f1c.zip
general: Resolve -Wunused-lambda-capture and C5233
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/texture_cache/texture_cache.h8
-rw-r--r--src/video_core/textures/astc.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 0e0fd410f..8ef75fe73 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) {
442template <class P> 442template <class P>
443void TextureCache<P>::DownloadMemory(VAddr cpu_addr, size_t size) { 443void TextureCache<P>::DownloadMemory(VAddr cpu_addr, size_t size) {
444 std::vector<ImageId> images; 444 std::vector<ImageId> images;
445 ForEachImageInRegion(cpu_addr, size, [this, &images](ImageId image_id, ImageBase& image) { 445 ForEachImageInRegion(cpu_addr, size, [&images](ImageId image_id, ImageBase& image) {
446 if (!image.IsSafeDownload()) { 446 if (!image.IsSafeDownload()) {
447 return; 447 return;
448 } 448 }
@@ -1502,9 +1502,9 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
1502 image.flags &= ~ImageFlagBits::BadOverlap; 1502 image.flags &= ~ImageFlagBits::BadOverlap;
1503 lru_cache.Free(image.lru_index); 1503 lru_cache.Free(image.lru_index);
1504 const auto& clear_page_table = 1504 const auto& clear_page_table =
1505 [this, image_id](u64 page, 1505 [image_id](u64 page,
1506 std::unordered_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>& 1506 std::unordered_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&
1507 selected_page_table) { 1507 selected_page_table) {
1508 const auto page_it = selected_page_table.find(page); 1508 const auto page_it = selected_page_table.find(page);
1509 if (page_it == selected_page_table.end()) { 1509 if (page_it == selected_page_table.end()) {
1510 ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS); 1510 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.cpp
index 15b9d4182..69a32819a 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,
1661 for (u32 z = 0; z < depth; ++z) { 1661 for (u32 z = 0; z < depth; ++z) {
1662 const u32 depth_offset = z * height * width * 4; 1662 const u32 depth_offset = z * height * width * 4;
1663 for (u32 y_index = 0; y_index < rows; ++y_index) { 1663 for (u32 y_index = 0; y_index < rows; ++y_index) {
1664 auto decompress_stride = [data, width, height, depth, block_width, block_height, output, 1664 auto decompress_stride = [data, width, height, block_width, block_height, output, rows,
1665 rows, cols, z, depth_offset, y_index] { 1665 cols, z, depth_offset, y_index] {
1666 const u32 y = y_index * block_height; 1666 const u32 y = y_index * block_height;
1667 for (u32 x_index = 0; x_index < cols; ++x_index) { 1667 for (u32 x_index = 0; x_index < cols; ++x_index) {
1668 const u32 block_index = (z * rows * cols) + (y_index * cols) + x_index; 1668 const u32 block_index = (z * rows * cols) + (y_index * cols) + x_index;