summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Liam2023-05-25 12:03:12 -0400
committerGravatar Liam2023-05-25 12:03:12 -0400
commit904dc1a5676998225de9a2c0979c026006843ad5 (patch)
tree4879901833859011f43f9ba378e849d88c67ddeb
parentMerge pull request #10415 from german77/amiibo-no-key (diff)
downloadyuzu-904dc1a5676998225de9a2c0979c026006843ad5.tar.gz
yuzu-904dc1a5676998225de9a2c0979c026006843ad5.tar.xz
yuzu-904dc1a5676998225de9a2c0979c026006843ad5.zip
video_core: don't garbage collect during configuration
-rw-r--r--src/video_core/texture_cache/texture_cache.h5
-rw-r--r--src/video_core/texture_cache/texture_cache_base.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 31d754550..fe13cac93 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -139,7 +139,6 @@ void TextureCache<P>::TickFrame() {
139 TickAsyncDecode(); 139 TickAsyncDecode();
140 140
141 runtime.TickFrame(); 141 runtime.TickFrame();
142 critical_gc = 0;
143 ++frame_tick; 142 ++frame_tick;
144 143
145 if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { 144 if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) {
@@ -1885,10 +1884,6 @@ void TextureCache<P>::RegisterImage(ImageId image_id) {
1885 tentative_size = EstimatedDecompressedSize(tentative_size, image.info.format); 1884 tentative_size = EstimatedDecompressedSize(tentative_size, image.info.format);
1886 } 1885 }
1887 total_used_memory += Common::AlignUp(tentative_size, 1024); 1886 total_used_memory += Common::AlignUp(tentative_size, 1024);
1888 if (total_used_memory > critical_memory && critical_gc < GC_EMERGENCY_COUNTS) {
1889 RunGarbageCollector();
1890 critical_gc++;
1891 }
1892 image.lru_index = lru_cache.Insert(image_id, frame_tick); 1887 image.lru_index = lru_cache.Insert(image_id, frame_tick);
1893 1888
1894 ForEachGPUPage(image.gpu_addr, image.guest_size_bytes, [this, image_id](u64 page) { 1889 ForEachGPUPage(image.gpu_addr, image.guest_size_bytes, [this, image_id](u64 page) {
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h
index 1a3308e2d..cc27286f7 100644
--- a/src/video_core/texture_cache/texture_cache_base.h
+++ b/src/video_core/texture_cache/texture_cache_base.h
@@ -427,7 +427,6 @@ private:
427 u64 minimum_memory; 427 u64 minimum_memory;
428 u64 expected_memory; 428 u64 expected_memory;
429 u64 critical_memory; 429 u64 critical_memory;
430 size_t critical_gc;
431 430
432 struct BufferDownload { 431 struct BufferDownload {
433 GPUVAddr address; 432 GPUVAddr address;