tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Texture cache: Fix memory consumption and ignore rating when a depth texture is rendered.

Browse Source
This commit is contained in:
Fernando Sahmkow 2021-10-17 01:22:13 +02:00
parent 618de4e787
commit ef1dc42635
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_core/renderer_opengl/gl_texture_cache.cpp
View File

@ -967,21 +967,24 @@ bool Image::ScaleUp() {
if (True(flags & ImageFlagBits::Rescaled)) { if (True(flags & ImageFlagBits::Rescaled)) {
return false; return false;
} }
flags |= ImageFlagBits::Rescaled;
if (!runtime->resolution.active) { if (!runtime->resolution.active) {
return false; return false;
} }
if (gl_format == 0 && gl_type == 0) { if (gl_format == 0 && gl_type == 0) {
// compressed textures // compressed textures
flags &= ~ImageFlagBits::Rescaled;
return false; return false;
} }
if (info.type == ImageType::Linear) { if (info.type == ImageType::Linear) {
UNIMPLEMENTED(); UNREACHABLE();
flags &= ~ImageFlagBits::Rescaled;
return false; return false;
} }
if (!Scale()) { if (!Scale()) {
flags &= ~ImageFlagBits::Rescaled;
return false; return false;
} }
flags |= ImageFlagBits::Rescaled;
return true; return true;
} }
@ -990,6 +993,9 @@ bool Image::ScaleDown() {
return false; return false;
} }
flags &= ~ImageFlagBits::Rescaled; flags &= ~ImageFlagBits::Rescaled;
if (!runtime->resolution.active) {
return false;
}
current_texture = texture.handle; current_texture = texture.handle;
return true; return true;
} }

9
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -1126,6 +1126,7 @@ bool Image::ScaleUp() {
return false; return false;
} }
ASSERT(info.type != ImageType::Linear); ASSERT(info.type != ImageType::Linear);
flags |= ImageFlagBits::Rescaled;
const auto& resolution = runtime->resolution; const auto& resolution = runtime->resolution;
if (!resolution.active) { if (!resolution.active) {
return false; return false;
@ -1188,11 +1189,11 @@ bool Image::ScaleUp() {
dst_region, src_region, Tegra::Engines::Fermi2D::Filter::Point, BLIT_OPERATION); dst_region, src_region, Tegra::Engines::Fermi2D::Filter::Point, BLIT_OPERATION);
} else { } else {
// TODO: Use helper blits where applicable // TODO: Use helper blits where applicable
flags &= ~ImageFlagBits::Rescaled;
LOG_ERROR(Render_Vulkan, "Device does not support scaling format {}", format); LOG_ERROR(Render_Vulkan, "Device does not support scaling format {}", format);
return false; return false;
} }
} }
flags |= ImageFlagBits::Rescaled;
return true; return true;
} }
@ -1200,8 +1201,12 @@ bool Image::ScaleDown() {
if (False(flags & ImageFlagBits::Rescaled)) { if (False(flags & ImageFlagBits::Rescaled)) {
return false; return false;
} }
ASSERT(info.type != ImageType::Linear);
flags &= ~ImageFlagBits::Rescaled; flags &= ~ImageFlagBits::Rescaled;
const auto& resolution = runtime->resolution;
if (!resolution.active) {
return false;
}
ASSERT(info.type != ImageType::Linear);
current_image = *original_image; current_image = *original_image;
return true; return true;
} }

7
src/video_core/texture_cache/texture_cache.h
View File

@ -230,7 +230,8 @@ void TextureCache<P>::UpdateRenderTargets(bool is_clear) {
auto& image = slot_images[image_id]; auto& image = slot_images[image_id];
can_rescale &= ImageCanRescale(image); can_rescale &= ImageCanRescale(image);
any_blacklisted |= True(image.flags & ImageFlagBits::Blacklisted); any_blacklisted |= True(image.flags & ImageFlagBits::Blacklisted);
any_rescaled |= True(image.flags & ImageFlagBits::Rescaled); any_rescaled |= True(image.flags & ImageFlagBits::Rescaled) ||
GetFormatType(image.info.format) != SurfaceType::ColorTexture;
scale_rating = std::max<u32>(scale_rating, image.scale_tick <= frame_tick scale_rating = std::max<u32>(scale_rating, image.scale_tick <= frame_tick
? image.scale_rating + 1U ? image.scale_rating + 1U
: image.scale_rating); : image.scale_rating);
@ -857,7 +858,7 @@ u64 TextureCache<P>::GetScaledImageSizeBytes(Image& image) {
const f32 add_to_size = Settings::values.resolution_info.up_factor - 1.0f; const f32 add_to_size = Settings::values.resolution_info.up_factor - 1.0f;
const bool sign = std::signbit(add_to_size); const bool sign = std::signbit(add_to_size);
const u32 image_size_bytes = std::max(image.guest_size_bytes, image.unswizzled_size_bytes); const u32 image_size_bytes = std::max(image.guest_size_bytes, image.unswizzled_size_bytes);
const u64 tentative_size = image_size_bytes * static_cast<u32>(std::abs(add_to_size)); const u64 tentative_size = image_size_bytes * static_cast<u64>(std::abs(add_to_size));
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 sign ? -fitted_size : fitted_size;
} }
@ -879,7 +880,7 @@ bool TextureCache<P>::ScaleDown(Image& image) {
if (!rescaled) { if (!rescaled) {
return false; return false;
} }
total_used_memory += GetScaledImageSizeBytes(image); total_used_memory -= GetScaledImageSizeBytes(image);
InvalidateScale(image); InvalidateScale(image);
return true; return true;
} }