mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-02 14:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoCommon: texture cache update for new asset system...

Browse source
This commit is contained in:
iwubcode 2024-06-24 01:09:14 -05:00
commit 7b70311a5f
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureCache.cpp
View file

@ -27,24 +27,24 @@ std::optional<CustomTextureCache::TextureResult> CustomTextureCache::GetTextureA
CustomAssetLoader& loader, std::shared_ptr<CustomAssetLibrary> library, CustomAssetLoader& loader, std::shared_ptr<CustomAssetLibrary> library,
const CustomAssetLibrary::AssetID& asset_id, AbstractTextureType texture_type) const CustomAssetLibrary::AssetID& asset_id, AbstractTextureType texture_type)
{ {
auto asset = loader.LoadGameTexture(asset_id, library);
if (!asset)
{
return std::nullopt;
}
const auto [iter, inserted] = m_cached_texture_assets.try_emplace(asset_id, CachedTextureAsset{}); const auto [iter, inserted] = m_cached_texture_assets.try_emplace(asset_id, CachedTextureAsset{});
if (inserted || if (inserted || !iter->second.cached_asset.m_asset ||
iter->second.cached_asset.m_asset->GetLastLoadedTime() > iter->second.cached_asset.m_asset->GetLastLoadedTime() >
iter->second.cached_asset.m_cached_write_time || iter->second.cached_asset.m_cached_write_time ||
asset_id != iter->second.cached_asset.m_asset->GetAssetId() || asset_id != iter->second.cached_asset.m_asset->GetAssetId() || !iter->second.texture ||
iter->second.texture->GetConfig().type != texture_type) iter->second.texture->GetConfig().type != texture_type)
{ {
auto asset = loader.LoadGameTexture(asset_id, library);
const auto loaded_time = asset->GetLastLoadedTime(); const auto loaded_time = asset->GetLastLoadedTime();
iter->second.cached_asset = iter->second.cached_asset =
VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>{std::move(asset), loaded_time}; VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>{std::move(asset), loaded_time};
ReleaseToPool(&iter->second); ReleaseToPool(&iter->second);
} }
else
{
loader.AssetReferenced(iter->second.cached_asset.m_asset->GetSessionId());
}
iter->second.time = std::chrono::steady_clock::now();
const auto texture_data = iter->second.cached_asset.m_asset->GetData(); const auto texture_data = iter->second.cached_asset.m_asset->GetData();
if (!texture_data) if (!texture_data)
@ -54,7 +54,6 @@ std::optional<CustomTextureCache::TextureResult> CustomTextureCache::GetTextureA
if (iter->second.texture) if (iter->second.texture)
{ {
iter->second.time = std::chrono::steady_clock::now();
return TextureResult{iter->second.texture.get(), iter->second.framebuffer.get(), texture_data}; return TextureResult{iter->second.texture.get(), iter->second.framebuffer.get(), texture_data};
} }
@ -86,7 +85,6 @@ std::optional<CustomTextureCache::TextureResult> CustomTextureCache::GetTextureA
} }
} }
iter->second.time = std::chrono::steady_clock::now();
return TextureResult{iter->second.texture.get(), iter->second.framebuffer.get(), texture_data}; return TextureResult{iter->second.texture.get(), iter->second.framebuffer.get(), texture_data};
} }