franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

query_cache: Fix ambiguity in CacheAddr getter

This commit is contained in:
ReinUsesLisp 2020-02-13 15:31:37 -03:00
parent cc0694559f
commit 54a00ee4cf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_core/query_cache.h
View File

@ -172,7 +172,7 @@ private:
const u64 addr_begin = static_cast<u64>(addr); const u64 addr_begin = static_cast<u64>(addr);
const u64 addr_end = addr_begin + static_cast<u64>(size); const u64 addr_end = addr_begin + static_cast<u64>(size);
const auto in_range = [addr_begin, addr_end](CachedQuery& query) { const auto in_range = [addr_begin, addr_end](CachedQuery& query) {
const u64 cache_begin = query.CacheAddr(); const u64 cache_begin = query.GetCacheAddr();
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;
}; };
@ -212,8 +212,9 @@ private:
return nullptr; return nullptr;
} }
auto& contents = it->second; auto& contents = it->second;
const auto found = std::find_if(std::begin(contents), std::end(contents), const auto found =
[addr](auto& query) { return query.CacheAddr() == addr; }); std::find_if(std::begin(contents), std::end(contents),
[addr](auto& query) { return query.GetCacheAddr() == addr; });
return found != std::end(contents) ? &*found : nullptr; return found != std::end(contents) ? &*found : nullptr;
} }
@ -326,7 +327,7 @@ public:
return cpu_addr; return cpu_addr;
} }
CacheAddr CacheAddr() const noexcept { CacheAddr GetCacheAddr() const noexcept {
return ToCacheAddr(host_ptr); return ToCacheAddr(host_ptr);
} }