mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 10:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Lander Gallastegi 2025-07-19 00:34:41 +02:00
parent 9357180f66
commit 779b22ab1d
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/func_traits.h
View File

@ -38,7 +38,6 @@ template <class Func>
struct FuncTraits<Func, std::void_t<decltype(&std::remove_reference_t<Func>::operator())>>
: FuncTraits<decltype(&std::remove_reference_t<Func>::operator())> {};
// For lambdas: for compat (may be removed)
template <typename Func>
struct LambdaTraits : LambdaTraits<decltype(&std::remove_reference_t<Func>::operator())> {};

60
src/video_core/buffer_cache/buffer_cache.cpp
View File

@ -1069,35 +1069,41 @@ void BufferCache::SynchronizeBuffersForDma() {
};
mapped_ranges.ForEach([&](VAddr device_addr, u64 size) {
RENDERER_TRACE;
memory_tracker->ForEachUploadRange(device_addr, size, false, [&](u64 device_addr_out, u64 range_size, RegionBits& clear_mask) {
RENDERER_TRACE;
ForEachBufferInRange(device_addr_out, range_size, [&](BufferId buffer_id, Buffer& buffer) {
memory_tracker->ForEachUploadRange(
device_addr, size, false,
[&](u64 device_addr_out, u64 range_size, RegionBits& clear_mask) {
RENDERER_TRACE;
if (last_buffer_id != buffer_id) {
upload_pending();
last_buffer_id = buffer_id;
}
const VAddr copy_start = std::max(buffer.CpuAddr(), device_addr_out);
const VAddr copy_end = std::min(buffer.CpuAddr() + buffer.SizeBytes(), device_addr_out + range_size);
const u32 copy_size = static_cast<u32>(copy_end - copy_start);
if (copy_size == 0) {
return;
}
const u64 offset = staging_buffer.Copy(copy_start, copy_size);
copies.push_back(vk::BufferCopy{
.srcOffset = offset,
.dstOffset = copy_start - buffer.CpuAddr(),
.size = copy_size,
});
ForEachBufferInRange(
device_addr_out, range_size, [&](BufferId buffer_id, Buffer& buffer) {
RENDERER_TRACE;
if (last_buffer_id != buffer_id) {
upload_pending();
last_buffer_id = buffer_id;
}
const VAddr copy_start = std::max(buffer.CpuAddr(), device_addr_out);
const VAddr copy_end = std::min(buffer.CpuAddr() + buffer.SizeBytes(),
device_addr_out + range_size);
const u32 copy_size = static_cast<u32>(copy_end - copy_start);
if (copy_size == 0) {
return;
}
const u64 offset = staging_buffer.Copy(copy_start, copy_size);
copies.push_back(vk::BufferCopy{
.srcOffset = offset,
.dstOffset = copy_start - buffer.CpuAddr(),
.size = copy_size,
});
// We need to use tracker page size here, we are marking the clear mask
const u64 page_start = (copy_start & TRACKER_HIGHER_PAGE_MASK) >> TRACKER_PAGE_BITS;
const u64 page_end =
Common::DivCeil((copy_end - 1) & TRACKER_HIGHER_PAGE_MASK, TRACKER_BYTES_PER_PAGE);
ASSERT(page_start < page_end);
clear_mask.SetRange(page_start, page_end);
});
}, upload_pending);
// We need to use tracker page size here, we are marking the clear mask
const u64 page_start =
(copy_start & TRACKER_HIGHER_PAGE_MASK) >> TRACKER_PAGE_BITS;
const u64 page_end = Common::DivCeil(
(copy_end - 1) & TRACKER_HIGHER_PAGE_MASK, TRACKER_BYTES_PER_PAGE);
ASSERT(page_start < page_end);
clear_mask.SetRange(page_start, page_end);
});
},
upload_pending);
});
MemoryBarrier();
}

1
src/video_core/buffer_cache/region_definitions.h
View File

@ -23,7 +23,6 @@ enum class Type {
GPU,
};
using RegionBits = Common::BitArray<NUM_PAGES_PER_REGION>;
} // namespace VideoCore