etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Buffer Cache: Release stagging buffers on tick frame

Browse source
This commit is contained in:
Fernando Sahmkow 2023-04-23 21:03:50 +02:00
parent fff6155bc3
commit f8d31d1ae1
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/video_core/buffer_cache/buffer_cache.h
View file

@ -22,7 +22,7 @@ BufferCache<P>::BufferCache(VideoCore::RasterizerInterface& rasterizer_,
void(slot_buffers.insert(runtime, NullBufferParams{})); void(slot_buffers.insert(runtime, NullBufferParams{}));
common_ranges.clear(); common_ranges.clear();
active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); active_async_buffers = !Settings::IsGPULevelHigh();
if (!runtime.CanReportMemoryUsage()) { if (!runtime.CanReportMemoryUsage()) {
minimum_memory = DEFAULT_EXPECTED_MEMORY; minimum_memory = DEFAULT_EXPECTED_MEMORY;
@ -74,7 +74,7 @@ void BufferCache<P>::TickFrame() {
uniform_cache_hits[0] = 0; uniform_cache_hits[0] = 0;
uniform_cache_shots[0] = 0; uniform_cache_shots[0] = 0;
active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); active_async_buffers = !Settings::IsGPULevelHigh();
const bool skip_preferred = hits * 256 < shots * 251; const bool skip_preferred = hits * 256 < shots * 251;
uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0;
@ -88,6 +88,13 @@ void BufferCache<P>::TickFrame() {
} }
++frame_tick; ++frame_tick;
delayed_destruction_ring.Tick(); delayed_destruction_ring.Tick();
if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) {
for (auto& buffer : async_buffers_death_ring) {
runtime.FreeDeferredStagingBuffer(buffer);
}
async_buffers_death_ring.clear();
}
} }
template <class P> template <class P>
@ -468,8 +475,10 @@ void BufferCache<P>::CommitAsyncFlushesHigh() {
AccumulateFlushes(); AccumulateFlushes();
if (committed_ranges.empty()) { if (committed_ranges.empty()) {
if (active_async_buffers) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) {
async_buffers.emplace_back(std::optional<Async_Buffer>{}); if (active_async_buffers) {
async_buffers.emplace_back(std::optional<Async_Buffer>{});
}
} }
return; return;
} }
@ -529,8 +538,10 @@ void BufferCache<P>::CommitAsyncFlushesHigh() {
} }
committed_ranges.clear(); committed_ranges.clear();
if (downloads.empty()) { if (downloads.empty()) {
if (active_async_buffers) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) {
async_buffers.emplace_back(std::optional<Async_Buffer>{}); if (active_async_buffers) {
async_buffers.emplace_back(std::optional<Async_Buffer>{});
}
} }
return; return;
} }
@ -555,6 +566,9 @@ void BufferCache<P>::CommitAsyncFlushesHigh() {
runtime.PostCopyBarrier(); runtime.PostCopyBarrier();
pending_downloads.emplace_back(std::move(normalized_copies)); pending_downloads.emplace_back(std::move(normalized_copies));
async_buffers.emplace_back(download_staging); async_buffers.emplace_back(download_staging);
} else {
committed_ranges.clear();
uncommitted_ranges.clear();
} }
} else { } else {
if constexpr (USE_MEMORY_MAPS) { if constexpr (USE_MEMORY_MAPS) {
@ -629,7 +643,7 @@ void BufferCache<P>::PopAsyncBuffers() {
const IntervalType subtract_interval{cpu_addr, cpu_addr + copy.size}; const IntervalType subtract_interval{cpu_addr, cpu_addr + copy.size};
RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1); RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1);
} }
runtime.FreeDeferredStagingBuffer(*async_buffer); async_buffers_death_ring.emplace_back(*async_buffer);
async_buffers.pop_front(); async_buffers.pop_front();
pending_downloads.pop_front(); pending_downloads.pop_front();
} }

6
src/video_core/buffer_cache/buffer_cache_base.h
View file

@ -554,11 +554,7 @@ private:
std::deque<boost::container::small_vector<BufferCopy, 4>> pending_downloads; std::deque<boost::container::small_vector<BufferCopy, 4>> pending_downloads;
std::optional<Async_Buffer> current_buffer; std::optional<Async_Buffer> current_buffer;
// queries std::deque<Async_Buffer> async_buffers_death_ring;
boost::container::small_vector<std::pair<VAddr, size_t>, 8> pending_queries;
std::deque<boost::container::small_vector<BufferCopy, 8>> committed_queries;
boost::container::small_vector<u64, 8> flushed_queries;
std::deque<std::optional<Async_Buffer>> query_async_buffers;
size_t immediate_buffer_capacity = 0; size_t immediate_buffer_capacity = 0;
Common::ScratchBuffer<u8> immediate_buffer_alloc; Common::ScratchBuffer<u8> immediate_buffer_alloc;