diff options
| author |  liamwhite | 2023-02-21 18:58:04 -0500 |
|---|---|---|
| committer |  GitHub | 2023-02-21 18:58:04 -0500 |
| commit | 11f6bb153251462bf55afa59ba99b98f9c9ecaa1 (patch) | |
| tree | 22a1c190d8ce59d7cb7599c1a8cf6dfbdfe53eea /src/video_core/buffer_cache | |
| parent | Merge pull request #9841 from abouvier/httplib-update (diff) | |
| parent | svc: Fix type consistency (exposed on macOS) (diff) | |
| download | yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.tar.gz yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.tar.xz yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.zip | |
Merge pull request #9846 from merryhime/type-const
svc: Fix type consistency (exposed on macOS)
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index 92d77eef2..1b4d63616 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h | |||
| @@ -568,7 +568,7 @@ private: | |||
| 568 | const u64* const state_words = Array<type>(); | 568 | const u64* const state_words = Array<type>(); |
| 569 | const u64 num_query_words = size / BYTES_PER_WORD + 1; | 569 | const u64 num_query_words = size / BYTES_PER_WORD + 1; |
| 570 | const u64 word_begin = offset / BYTES_PER_WORD; | 570 | const u64 word_begin = offset / BYTES_PER_WORD; |
| 571 | const u64 word_end = std::min(word_begin + num_query_words, NumWords()); | 571 | const u64 word_end = std::min<u64>(word_begin + num_query_words, NumWords()); |
| 572 | const u64 page_base = offset / BYTES_PER_PAGE; | 572 | const u64 page_base = offset / BYTES_PER_PAGE; |
| 573 | const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); | 573 | const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); |
| 574 | u64 begin = std::numeric_limits<u64>::max(); | 574 | u64 begin = std::numeric_limits<u64>::max(); |