diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp index a07d912ea..bd41a3bc5 100644 --- a/src/video_core/texture_cache/texture_cache.cpp +++ b/src/video_core/texture_cache/texture_cache.cpp @@ -595,10 +595,7 @@ ImageId TextureCache::FindImage(ImageDesc& desc, bool exact_fmt) { ImageId TextureCache::FindImageFromRange(VAddr address, size_t size, bool ensure_valid) { SmallVector image_ids; - ForEachImageInRegion(address, size, [&](ImageId image_id, Image& image) { - if (image.info.guest_address != address) { - return; - } + ForEachImageWithAddress(address, [&](ImageId image_id, Image& image) { if (ensure_valid && !image.SafeToDownload()) { return; } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index b3c50b06d..b20145475 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -277,6 +277,20 @@ public: }); } + template + void ForEachImageWithAddress(VAddr cpu_addr, Func&& func) { + const auto it = page_table.find(cpu_addr >> Traits::PAGE_BITS); + if (it == nullptr) { + return; + } + const u32 key = u32(cpu_addr >> 8); + for (const auto& entry : it->entries) { + if (entry.key == key) { + func(entry.id, slot_images[entry.id]); + } + } + } + private: /// Iterate over all page indices in a range template