octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6186 from lioncash/cache-erase

Browse Source 
query_cache: Make use of std::erase_if
This commit is contained in:
bunnei
2021-04-12 17:52:34 -07:00
committed by GitHub
parent 7f06276192 4209588505
commit 335a3cc115
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_core/query_cache.h
View File

@@ -208,9 +208,9 @@ public:
private: private:
/// Flushes a memory range to guest memory and removes it from the cache. /// Flushes a memory range to guest memory and removes it from the cache.
void FlushAndRemoveRegion(VAddr addr, std::size_t size) { void FlushAndRemoveRegion(VAddr addr, std::size_t size) {
const u64 addr_begin = static_cast<u64>(addr); const u64 addr_begin = addr;
const u64 addr_end = addr_begin + static_cast<u64>(size); const u64 addr_end = addr_begin + size;
const auto in_range = [addr_begin, addr_end](CachedQuery& query) { const auto in_range = [addr_begin, addr_end](const CachedQuery& query) {
const u64 cache_begin = query.GetCpuAddr(); const u64 cache_begin = query.GetCpuAddr();
const u64 cache_end = cache_begin + query.SizeInBytes(); const u64 cache_end = cache_begin + query.SizeInBytes();
return cache_begin < addr_end && addr_begin < cache_end; return cache_begin < addr_end && addr_begin < cache_end;
@@ -230,8 +230,7 @@ private:
rasterizer.UpdatePagesCachedCount(query.GetCpuAddr(), query.SizeInBytes(), -1); rasterizer.UpdatePagesCachedCount(query.GetCpuAddr(), query.SizeInBytes(), -1);
query.Flush(); query.Flush();
} }
contents.erase(std::remove_if(std::begin(contents), std::end(contents), in_range), std::erase_if(contents, in_range);
std::end(contents));
} }
} }