diff options
| author | 2023-11-29 12:33:41 -0500 | |
|---|---|---|
| committer | 2023-11-29 12:33:41 -0500 | |
| commit | 91ad6b7098e06948ea386f883ae816ad2cb809be (patch) | |
| tree | 92e56b888615d2c100c612ca2c235305b2e8b141 /src/video_core/buffer_cache | |
| parent | Merge pull request #12154 from liamwhite/more-drivers (diff) | |
| parent | video_core: fix mac compile (diff) | |
| download | yuzu-91ad6b7098e06948ea386f883ae816ad2cb809be.tar.gz yuzu-91ad6b7098e06948ea386f883ae816ad2cb809be.tar.xz yuzu-91ad6b7098e06948ea386f883ae816ad2cb809be.zip | |
Merge pull request #12194 from liamwhite/fruit-company
video_core: fix mac compile
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/usage_tracker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/buffer_cache/usage_tracker.h b/src/video_core/buffer_cache/usage_tracker.h index ab05fe415..5f8688d31 100644 --- a/src/video_core/buffer_cache/usage_tracker.h +++ b/src/video_core/buffer_cache/usage_tracker.h | |||
| @@ -58,7 +58,7 @@ private: | |||
| 58 | void TrackPage(u64 page, u64 offset, u64 size) noexcept { | 58 | void TrackPage(u64 page, u64 offset, u64 size) noexcept { |
| 59 | const size_t offset_in_page = offset % PAGE_BYTES; | 59 | const size_t offset_in_page = offset % PAGE_BYTES; |
| 60 | const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; | 60 | const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; |
| 61 | const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; | 61 | const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
| 62 | const size_t mask = ~u64{0} >> (64 - num_bits); | 62 | const size_t mask = ~u64{0} >> (64 - num_bits); |
| 63 | pages[page] |= (~u64{0} & mask) << first_bit; | 63 | pages[page] |= (~u64{0} & mask) << first_bit; |
| 64 | } | 64 | } |
| @@ -66,7 +66,7 @@ private: | |||
| 66 | bool IsPageUsed(u64 page, u64 offset, u64 size) const noexcept { | 66 | bool IsPageUsed(u64 page, u64 offset, u64 size) const noexcept { |
| 67 | const size_t offset_in_page = offset % PAGE_BYTES; | 67 | const size_t offset_in_page = offset % PAGE_BYTES; |
| 68 | const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; | 68 | const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; |
| 69 | const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; | 69 | const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; |
| 70 | const size_t mask = ~u64{0} >> (64 - num_bits); | 70 | const size_t mask = ~u64{0} >> (64 - num_bits); |
| 71 | const size_t mask2 = (~u64{0} & mask) << first_bit; | 71 | const size_t mask2 = (~u64{0} & mask) << first_bit; |
| 72 | return (pages[page] & mask2) != 0; | 72 | return (pages[page] & mask2) != 0; |