Browse Source
Merge pull request #12194 from liamwhite/fruit-company
video_core: fix mac compile
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/video_core/buffer_cache/usage_tracker.h
|
|
|
@ -58,7 +58,7 @@ private: |
|
|
|
void TrackPage(u64 page, u64 offset, u64 size) noexcept { |
|
|
|
const size_t offset_in_page = offset % PAGE_BYTES; |
|
|
|
const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t mask = ~u64{0} >> (64 - num_bits); |
|
|
|
pages[page] |= (~u64{0} & mask) << first_bit; |
|
|
|
} |
|
|
|
@ -66,7 +66,7 @@ private: |
|
|
|
bool IsPageUsed(u64 page, u64 offset, u64 size) const noexcept { |
|
|
|
const size_t offset_in_page = offset % PAGE_BYTES; |
|
|
|
const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
|
|
|
const size_t mask = ~u64{0} >> (64 - num_bits); |
|
|
|
const size_t mask2 = (~u64{0} & mask) << first_bit; |
|
|
|
return (pages[page] & mask2) != 0; |
|
|
|
|