yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #10143 from liamwhite/fruit-company-moment 

video_core: fix build on Apple Clang
This commit is contained in:
Morph 2023-05-03 10:52:56 -04:00 committed by GitHub
parent 627022bef9 e1c74cea10
commit daf7936095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/buffer_cache/buffer_cache.h
View File

@ -1426,7 +1426,7 @@ bool BufferCache<P>::SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr,
.size = sub_size, .size = sub_size,
}); });
total_size_bytes += sub_size; total_size_bytes += sub_size;
largest_copy = std::max(largest_copy, sub_size); largest_copy = std::max<u64>(largest_copy, sub_size);
} }
const std::span<BufferCopy> copies_span(copies.data(), copies.size()); const std::span<BufferCopy> copies_span(copies.data(), copies.size());
UploadMemory(buffer, total_size_bytes, largest_copy, copies_span); UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);

6
src/video_core/buffer_cache/memory_tracker_base.h
View File

@ -170,7 +170,8 @@ private:
std::size_t page_index{cpu_address >> HIGHER_PAGE_BITS}; std::size_t page_index{cpu_address >> HIGHER_PAGE_BITS};
u64 page_offset{cpu_address & HIGHER_PAGE_MASK}; u64 page_offset{cpu_address & HIGHER_PAGE_MASK};
while (remaining_size > 0) { while (remaining_size > 0) {
const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; const std::size_t copy_amount{
std::min<std::size_t>(HIGHER_PAGE_SIZE - page_offset, remaining_size)};
auto* manager{top_tier[page_index]}; auto* manager{top_tier[page_index]};
if (manager) { if (manager) {
if constexpr (BOOL_BREAK) { if constexpr (BOOL_BREAK) {
@ -206,7 +207,8 @@ private:
u64 begin = std::numeric_limits<u64>::max(); u64 begin = std::numeric_limits<u64>::max();
u64 end = 0; u64 end = 0;
while (remaining_size > 0) { while (remaining_size > 0) {
const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; const std::size_t copy_amount{
std::min<std::size_t>(HIGHER_PAGE_SIZE - page_offset, remaining_size)};
auto* manager{top_tier[page_index]}; auto* manager{top_tier[page_index]};
const auto execute = [&] { const auto execute = [&] {
auto [new_begin, new_end] = func(manager, page_offset, copy_amount); auto [new_begin, new_end] = func(manager, page_offset, copy_amount);

2
src/video_core/texture_cache/texture_cache.h
View File

@ -888,7 +888,7 @@ void TextureCache<P>::DownloadImageIntoBuffer(typename TextureCache<P>::Image* i
buffer, buffer,
download_map.buffer, download_map.buffer,
}; };
std::array buffer_offsets{ std::array<u64, 2> buffer_offsets{
buffer_offset, buffer_offset,
download_map.offset, download_map.offset,
}; };