From b669580aeb5209004dec00a1b1447c7949fc0073 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Thu, 21 Dec 2023 00:55:51 -0600 Subject: VideoCommon: handle asset memory going over reserved limit correctly by erroring when the memory is exceeded and not allowing more assets to load until memory is released --- Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp') diff --git a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp index 134b18b496..2812e422bf 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp @@ -3,7 +3,6 @@ #include "VideoCommon/Assets/CustomAssetLoader.h" -#include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" #include "VideoCommon/Assets/CustomAssetLibrary.h" @@ -48,19 +47,22 @@ void CustomAssetLoader::Init() m_asset_load_thread.Reset("Custom Asset Loader", [this](std::weak_ptr asset) { if (auto ptr = asset.lock()) { + if (m_memory_exceeded) + return; + if (ptr->Load()) { std::lock_guard lk(m_asset_load_lock); const std::size_t asset_memory_size = ptr->GetByteSizeInMemory(); - if (m_max_memory_available >= m_total_bytes_loaded + asset_memory_size) - { - m_total_bytes_loaded += asset_memory_size; - m_assets_to_monitor.try_emplace(ptr->GetAssetId(), ptr); - } - else + m_total_bytes_loaded += asset_memory_size; + m_assets_to_monitor.try_emplace(ptr->GetAssetId(), ptr); + if (m_total_bytes_loaded > m_max_memory_available) { - ERROR_LOG_FMT(VIDEO, "Failed to load asset {} because there was not enough memory.", + ERROR_LOG_FMT(VIDEO, + "Asset memory exceeded with asset '{}', future assets won't load until " + "memory is available.", ptr->GetAssetId()); + m_memory_exceeded = true; } } } -- cgit v1.2.3