mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-11-16 00:23:05 +00:00
Merge branch 'yuzu-emu:master' into master
This commit is contained in:
commit
5784aa1064
|
@ -327,8 +327,8 @@ private:
|
||||||
bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const {
|
bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const {
|
||||||
const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length});
|
const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length});
|
||||||
if (it != placeholders.end() && it->lower() == virtual_offset + length) {
|
if (it != placeholders.end() && it->lower() == virtual_offset + length) {
|
||||||
const bool is_root = it == placeholders.begin() && virtual_offset == 0;
|
return it == placeholders.begin() ? virtual_offset == 0
|
||||||
return is_root || std::prev(it)->upper() == virtual_offset;
|
: std::prev(it)->upper() == virtual_offset;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue