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

TextureCache: Improve Reaper.

Browse source
This commit is contained in:
FernandoS27 2021-10-20 23:21:52 +02:00 committed by Fernando Sahmkow
parent bb3e95133d
commit bf01b7993d
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/video_core/texture_cache/texture_cache.h
View file

@ -51,8 +51,8 @@ TextureCache<P>::TextureCache(Runtime& runtime_, VideoCore::RasterizerInterface&
if constexpr (HAS_DEVICE_MEMORY_INFO) { if constexpr (HAS_DEVICE_MEMORY_INFO) {
const auto device_memory = runtime.GetDeviceLocalMemory(); const auto device_memory = runtime.GetDeviceLocalMemory();
const u64 possible_expected_memory = (device_memory * 3) / 10; const u64 possible_expected_memory = (device_memory * 4) / 10;
const u64 possible_critical_memory = (device_memory * 6) / 10; const u64 possible_critical_memory = (device_memory * 7) / 10;
expected_memory = std::max(possible_expected_memory, DEFAULT_EXPECTED_MEMORY); expected_memory = std::max(possible_expected_memory, DEFAULT_EXPECTED_MEMORY);
critical_memory = std::max(possible_critical_memory, DEFAULT_CRITICAL_MEMORY); critical_memory = std::max(possible_critical_memory, DEFAULT_CRITICAL_MEMORY);
minimum_memory = 0; minimum_memory = 0;
@ -69,7 +69,7 @@ void TextureCache<P>::RunGarbageCollector() {
const bool high_priority_mode = total_used_memory >= expected_memory; const bool high_priority_mode = total_used_memory >= expected_memory;
const bool aggressive_mode = total_used_memory >= critical_memory; const bool aggressive_mode = total_used_memory >= critical_memory;
const u64 ticks_to_destroy = aggressive_mode ? 10ULL : high_priority_mode ? 25ULL : 100ULL; const u64 ticks_to_destroy = aggressive_mode ? 10ULL : high_priority_mode ? 25ULL : 100ULL;
size_t num_iterations = aggressive_mode ? 10000 : (high_priority_mode ? 100 : 5); size_t num_iterations = aggressive_mode ? 300 : (high_priority_mode ? 50 : 10);
const auto clean_up = [this, &num_iterations, high_priority_mode](ImageId image_id) { const auto clean_up = [this, &num_iterations, high_priority_mode](ImageId image_id) {
if (num_iterations == 0) { if (num_iterations == 0) {
return true; return true;
@ -91,7 +91,7 @@ void TextureCache<P>::RunGarbageCollector() {
UntrackImage(image, image_id); UntrackImage(image, image_id);
} }
UnregisterImage(image_id); UnregisterImage(image_id);
DeleteImage(image_id); DeleteImage(image_id, image.scale_tick > frame_tick + 5);
return false; return false;
}; };
lru_cache.ForEachItemBelow(frame_tick - ticks_to_destroy, clean_up); lru_cache.ForEachItemBelow(frame_tick - ticks_to_destroy, clean_up);
@ -287,8 +287,10 @@ void TextureCache<P>::UpdateRenderTargets(bool is_clear) {
if (image_id != CORRUPT_ID) { if (image_id != CORRUPT_ID) {
Image& image = slot_images[image_id]; Image& image = slot_images[image_id];
image.scale_rating = scale_rating; image.scale_rating = scale_rating;
if (image.scale_tick <= frame_tick) {
image.scale_tick = frame_tick + 1; image.scale_tick = frame_tick + 1;
} }
}
}; };
for (size_t index = 0; index < NUM_RT; ++index) { for (size_t index = 0; index < NUM_RT; ++index) {
set_rating(tmp_color_images[index]); set_rating(tmp_color_images[index]);
@ -810,6 +812,9 @@ bool TextureCache<P>::ImageCanRescale(ImageBase& image) {
template <class P> template <class P>
void TextureCache<P>::InvalidateScale(Image& image) { void TextureCache<P>::InvalidateScale(Image& image) {
if (image.scale_tick <= frame_tick) {
image.scale_tick = frame_tick + 1;
}
const std::span<const ImageViewId> image_view_ids = image.image_view_ids; const std::span<const ImageViewId> image_view_ids = image.image_view_ids;
auto& dirty = maxwell3d.dirty.flags; auto& dirty = maxwell3d.dirty.flags;
dirty[Dirty::RenderTargets] = true; dirty[Dirty::RenderTargets] = true;
@ -842,12 +847,15 @@ void TextureCache<P>::InvalidateScale(Image& image) {
template <class P> template <class P>
u64 TextureCache<P>::GetScaledImageSizeBytes(ImageBase& image) { u64 TextureCache<P>::GetScaledImageSizeBytes(ImageBase& image) {
const f32 add_to_size = Settings::values.resolution_info.up_factor; const u64 scale_up = static_cast<u64>(Settings::values.resolution_info.up_scale *
const bool sign = std::signbit(add_to_size); Settings::values.resolution_info.up_scale);
const u32 image_size_bytes = std::max(image.guest_size_bytes, image.unswizzled_size_bytes); const u64 down_shift = static_cast<u64>(Settings::values.resolution_info.down_shift +
const u64 tentative_size = image_size_bytes * static_cast<u64>(std::abs(add_to_size)); Settings::values.resolution_info.down_shift);
const u64 image_size_bytes =
static_cast<u64>(std::max(image.guest_size_bytes, image.unswizzled_size_bytes));
const u64 tentative_size = (image_size_bytes * scale_up) >> down_shift;
const u64 fitted_size = Common::AlignUp(tentative_size, 1024); const u64 fitted_size = Common::AlignUp(tentative_size, 1024);
return sign ? -fitted_size : fitted_size; return fitted_size;
} }
template <class P> template <class P>
@ -1510,7 +1518,7 @@ void TextureCache<P>::UntrackImage(ImageBase& image, ImageId image_id) {
} }
template <class P> template <class P>
void TextureCache<P>::DeleteImage(ImageId image_id) { void TextureCache<P>::DeleteImage(ImageId image_id, bool immediate_delete) {
ImageBase& image = slot_images[image_id]; ImageBase& image = slot_images[image_id];
if (image.HasScaled()) { if (image.HasScaled()) {
total_used_memory -= GetScaledImageSizeBytes(image); total_used_memory -= GetScaledImageSizeBytes(image);
@ -1576,10 +1584,14 @@ void TextureCache<P>::DeleteImage(ImageId image_id) {
num_removed_overlaps); num_removed_overlaps);
} }
for (const ImageViewId image_view_id : image_view_ids) { for (const ImageViewId image_view_id : image_view_ids) {
if (!immediate_delete) {
sentenced_image_view.Push(std::move(slot_image_views[image_view_id])); sentenced_image_view.Push(std::move(slot_image_views[image_view_id]));
}
slot_image_views.erase(image_view_id); slot_image_views.erase(image_view_id);
} }
if (!immediate_delete) {
sentenced_images.Push(std::move(slot_images[image_id])); sentenced_images.Push(std::move(slot_images[image_id]));
}
slot_images.erase(image_id); slot_images.erase(image_id);
alloc_images.erase(alloc_image_it); alloc_images.erase(alloc_image_it);

2
src/video_core/texture_cache/texture_cache_base.h
View file

@ -292,7 +292,7 @@ private:
void UntrackImage(ImageBase& image, ImageId image_id); void UntrackImage(ImageBase& image, ImageId image_id);
/// Delete image from the cache /// Delete image from the cache
void DeleteImage(ImageId image); void DeleteImage(ImageId image, bool immediate_delete = false);
/// Remove image views references from the cache /// Remove image views references from the cache
void RemoveImageViewReferences(std::span<const ImageViewId> removed_views); void RemoveImageViewReferences(std::span<const ImageViewId> removed_views);