raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-28 13:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

renderer: simplify image buffer owner lookup

Browse Source
This commit is contained in:
nmzik
2026-08-18 02:53:20 +02:00
parent fe867d03f6
commit 79e424182b
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/host_gpu/renderer/cache/bufferCache.cpp
Vendored
+18 -26
View File
@@ -527,21 +527,13 @@ ImageBufferSource BufferCache::ObtainBufferForImage(uint64_t vaddr, uint64_t siz
size > TRACKER_ADDRESS_SIZE - vaddr) { size > TRACKER_ADDRESS_SIZE - vaddr) {
EXIT("BufferCache: invalid image source\n"); EXIT("BufferCache: invalid image source\n");
} }
auto find_owner = [&]() { auto find_owner = [&]() -> CachedBuffer* {
auto owner = m_buffers.upper_bound(vaddr); auto owner = m_buffers.upper_bound(vaddr);
if (owner == m_buffers.begin()) { if (owner == m_buffers.begin()) {
return m_buffers.end(); return nullptr;
} }
--owner; --owner;
return owner->second->buffer->IsInBounds(vaddr, size) ? owner : m_buffers.end(); return owner->second->buffer->IsInBounds(vaddr, size) ? owner->second.get() : nullptr;
};
auto has_overlapping_owner = [&]() {
auto owner = m_buffers.lower_bound(vaddr + size);
if (owner == m_buffers.begin()) {
return false;
}
--owner;
return owner->second->vaddr + owner->second->size > vaddr;
}; };
{ {
@@ -552,24 +544,24 @@ ImageBufferSource BufferCache::ObtainBufferForImage(uint64_t vaddr, uint64_t siz
m_memory_tracker.ValidateGpuDirtyOwnership(m_gpu_modified_ranges, vaddr, size, m_memory_tracker.ValidateGpuDirtyOwnership(m_gpu_modified_ranges, vaddr, size,
"image source"); "image source");
auto owner = find_owner(); auto* owner = find_owner();
if (has_dirty_buffer_source && owner == m_buffers.end()) { if (has_dirty_buffer_source && owner == nullptr) {
if (!has_overlapping_owner()) { if (!IsRegionRegistered(vaddr, size)) {
EXIT("BufferCache: GPU-dirty image source has no native buffer\n"); EXIT("BufferCache: GPU-dirty image source has no native buffer\n");
} }
auto& cached = GetOrCreateBuffer(m_scheduler.Current(), vaddr, size); auto& cached = GetOrCreateBuffer(m_scheduler.Current(), vaddr, size);
owner = m_buffers.find(cached.vaddr); owner = &cached;
if (owner == m_buffers.end() || owner->second.get() != &cached || const auto resolved = m_buffers.find(cached.vaddr);
if (resolved == m_buffers.end() || resolved->second.get() != &cached ||
!cached.buffer->IsInBounds(vaddr, size)) { !cached.buffer->IsInBounds(vaddr, size)) {
EXIT("BufferCache: merged image source does not contain the requested range\n"); EXIT("BufferCache: merged image source does not contain the requested range\n");
} }
} }
if (owner != m_buffers.end() && !cpu_modified && if (owner != nullptr && !cpu_modified && (!gpu_modified || has_dirty_buffer_source)) {
(!gpu_modified || has_dirty_buffer_source)) { owner->tick_accessed_last = m_gc_tick;
owner->second->tick_accessed_last = m_gc_tick; return {owner->buffer.get(), owner->buffer->Offset(vaddr)};
return {owner->second->buffer.get(), owner->second->buffer->Offset(vaddr)};
} }
if (has_dirty_buffer_source && owner == m_buffers.end()) { if (has_dirty_buffer_source && owner == nullptr) {
EXIT("BufferCache: GPU-dirty image source could not resolve its native owner\n"); EXIT("BufferCache: GPU-dirty image source could not resolve its native owner\n");
} }
} }
@@ -583,16 +575,16 @@ ImageBufferSource BufferCache::ObtainBufferForImage(uint64_t vaddr, uint64_t siz
const auto dirty = m_gpu_modified_ranges.Intersections(vaddr, size); const auto dirty = m_gpu_modified_ranges.Intersections(vaddr, size);
const bool has_dirty_buffer_source = !dirty.empty(); const bool has_dirty_buffer_source = !dirty.empty();
auto owner = find_owner(); auto* owner = find_owner();
if (has_dirty_buffer_source && owner == m_buffers.end()) { if (has_dirty_buffer_source && owner == nullptr) {
EXIT("BufferCache: GPU-dirty image source lost its native owner\n"); EXIT("BufferCache: GPU-dirty image source lost its native owner\n");
} }
if (owner == m_buffers.end() || if (owner == nullptr ||
(m_memory_tracker.IsRegionGpuModified(vaddr, size) && !has_dirty_buffer_source)) { (m_memory_tracker.IsRegionGpuModified(vaddr, size) && !has_dirty_buffer_source)) {
return {&m_staging_buffer, stage_offset}; return {&m_staging_buffer, stage_offset};
} }
auto& cached = *owner->second; auto& cached = *owner;
cached.tick_accessed_last = m_gc_tick; cached.tick_accessed_last = m_gc_tick;
std::vector<std::pair<uint64_t, uint64_t>> uploads; std::vector<std::pair<uint64_t, uint64_t>> uploads;
m_memory_tracker.ForEachUploadRange( m_memory_tracker.ForEachUploadRange(