From 3c8388141325ac6ba9b399f16ee29ba34938e56f Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 4 Nov 2026 19:27:06 -0600 Subject: [PATCH] VideoCommon: error if the same asset id is used with a different type --- .../VideoCommon/Assets/CustomAssetCache.cpp | 4 +-- .../VideoCommon/Assets/CustomAssetCache.h | 26 ++++++++++++++----- .../Resources/MaterialResource.cpp | 9 +++++-- .../VideoCommon/Resources/ShaderResource.cpp | 7 +++++ .../Resources/TextureAndSamplerResource.cpp | 7 +++++ .../Resources/TextureDataResource.cpp | 7 +++++ 6 files changed, 49 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp index 3b15d5733e..6d46146911 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp @@ -95,7 +95,7 @@ void CustomAssetCache::ProcessDirtyAssets() { if (const auto it = m_asset_id_to_handle.find(asset_id); it != m_asset_id_to_handle.end()) { - const auto asset_handle = it->second; + const auto asset_handle = it->second.second; AssetData& asset_data = m_asset_handle_to_data[asset_handle]; asset_data.load_status = AssetData::LoadStatus::PendingReload; asset_data.load_request_time = now; @@ -103,7 +103,7 @@ void CustomAssetCache::ProcessDirtyAssets() // Asset was reloaded, clear any errors we might have asset_data.has_load_error = false; - m_pending_assets.InsertAsset(it->second, asset_data.asset.get()); + m_pending_assets.InsertAsset(asset_handle, asset_data.asset.get()); DEBUG_LOG_FMT(VIDEO, "Dirty asset pending reload: {}", asset_data.asset->GetAssetId()); } diff --git a/Source/Core/VideoCommon/Assets/CustomAssetCache.h b/Source/Core/VideoCommon/Assets/CustomAssetCache.h index 169c0faaf8..180dcf56d1 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetCache.h +++ b/Source/Core/VideoCommon/Assets/CustomAssetCache.h @@ -7,9 +7,11 @@ #include #include #include +#include #include #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "VideoCommon/Assets/AssetListener.h" #include "VideoCommon/Assets/CustomAsset.h" @@ -50,19 +52,28 @@ public: T* CreateAsset(const CustomAssetLibrary::AssetID& asset_id, std::shared_ptr library, AssetListener* listener) { - const auto [it, added] = - m_asset_id_to_handle.try_emplace(asset_id, m_asset_handle_to_data.size()); + const auto [it, added] = m_asset_id_to_handle.try_emplace( + asset_id, + std::pair{typeid(T), m_asset_handle_to_data.size()}); if (added) { AssetData asset_data; - asset_data.asset = std::make_unique(std::move(library), asset_id, it->second); + asset_data.asset = std::make_unique(std::move(library), asset_id, it->second.second); asset_data.load_request_time = {}; asset_data.has_load_error = false; - m_asset_handle_to_data.insert_or_assign(it->second, std::move(asset_data)); + m_asset_handle_to_data.insert_or_assign(it->second.second, std::move(asset_data)); + } + else if (it->second.first != typeid(T)) + { + ERROR_LOG_FMT( + VIDEO, + "Asset '{}' already exists in cache but with another type, check your configuration", + asset_id); + return nullptr; } - auto& asset_data_from_handle = m_asset_handle_to_data[it->second]; + auto& asset_data_from_handle = m_asset_handle_to_data[it->second.second]; asset_data_from_handle.listeners.push_back(listener); asset_data_from_handle.load_status = AssetData::LoadStatus::PendingReload; @@ -74,7 +85,7 @@ public: const auto it_handle = m_asset_id_to_handle.find(asset_id); if (it_handle == m_asset_id_to_handle.end()) return nullptr; - return &m_asset_handle_to_data[it_handle->second]; + return &m_asset_handle_to_data[it_handle->second.second]; } void Initialize(); @@ -182,7 +193,8 @@ private: AssetPriorityQueue m_pending_assets; std::map m_asset_handle_to_data; - std::map m_asset_id_to_handle; + std::map> + m_asset_id_to_handle; // Memory used by currently "loaded" assets. u64 m_ram_used = 0; diff --git a/Source/Core/VideoCommon/Resources/MaterialResource.cpp b/Source/Core/VideoCommon/Resources/MaterialResource.cpp index ea96cdf5f6..87ce88e41b 100644 --- a/Source/Core/VideoCommon/Resources/MaterialResource.cpp +++ b/Source/Core/VideoCommon/Resources/MaterialResource.cpp @@ -91,6 +91,9 @@ void MaterialResource::ResetData() Resource::TaskComplete MaterialResource::CollectPrimaryData() { + if (!m_material_asset) [[unlikely]] + return Resource::TaskComplete::Error; + const auto material_data = m_material_asset->GetData(); if (!material_data) [[unlikely]] { @@ -343,7 +346,8 @@ void MaterialResource::MarkAsActive() if (!m_current_data) [[unlikely]] return; - m_resource_context.asset_cache->MarkAssetActive(m_material_asset); + if (m_material_asset) + m_resource_context.asset_cache->MarkAssetActive(m_material_asset); for (const auto& texture_like_resource : m_current_data->m_texture_like_resources) { if (texture_like_resource) @@ -357,7 +361,8 @@ void MaterialResource::MarkAsActive() void MaterialResource::MarkAsPending() { - m_resource_context.asset_cache->MarkAssetPending(m_material_asset); + if (m_material_asset) + m_resource_context.asset_cache->MarkAssetPending(m_material_asset); } void MaterialResource::CreateTextureData(Data* data) diff --git a/Source/Core/VideoCommon/Resources/ShaderResource.cpp b/Source/Core/VideoCommon/Resources/ShaderResource.cpp index 7b77886e2e..a14395d363 100644 --- a/Source/Core/VideoCommon/Resources/ShaderResource.cpp +++ b/Source/Core/VideoCommon/Resources/ShaderResource.cpp @@ -400,11 +400,15 @@ void ShaderResource::SetHostConfig(const ShaderHostConfig& host_config) void ShaderResource::MarkAsPending() { + if (!m_shader_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetPending(m_shader_asset); } void ShaderResource::MarkAsActive() { + if (!m_shader_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetActive(m_shader_asset); } @@ -451,6 +455,9 @@ void ShaderResource::ResetData() Resource::TaskComplete ShaderResource::CollectPrimaryData() { + if (!m_shader_asset) [[unlikely]] + return Resource::TaskComplete::Error; + const auto shader_data = m_shader_asset->GetData(); if (!shader_data) [[unlikely]] { diff --git a/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp index 735a64a357..daf5577b92 100644 --- a/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp +++ b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp @@ -17,11 +17,15 @@ TextureAndSamplerResource::TextureAndSamplerResource(Resource::ResourceContext r void TextureAndSamplerResource::MarkAsActive() { + if (!m_texture_and_sampler_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetActive(m_texture_and_sampler_asset); } void TextureAndSamplerResource::MarkAsPending() { + if (!m_texture_and_sampler_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetPending(m_texture_and_sampler_asset); } @@ -37,6 +41,9 @@ void TextureAndSamplerResource::ResetData() Resource::TaskComplete TextureAndSamplerResource::CollectPrimaryData() { + if (!m_texture_and_sampler_asset) [[unlikely]] + return Resource::TaskComplete::Error; + m_load_data->m_texture_and_sampler_data = m_texture_and_sampler_asset->GetData(); if (!m_load_data->m_texture_and_sampler_data) return Resource::TaskComplete::No; diff --git a/Source/Core/VideoCommon/Resources/TextureDataResource.cpp b/Source/Core/VideoCommon/Resources/TextureDataResource.cpp index d72ae8d39d..869055c5d4 100644 --- a/Source/Core/VideoCommon/Resources/TextureDataResource.cpp +++ b/Source/Core/VideoCommon/Resources/TextureDataResource.cpp @@ -26,6 +26,9 @@ CustomAsset::TimeType TextureDataResource::GetLoadTime() const Resource::TaskComplete TextureDataResource::CollectPrimaryData() { + if (!m_texture_asset) [[unlikely]] + return Resource::TaskComplete::Error; + const auto last_load_time = m_texture_asset->GetLastLoadedTime(); const auto asset = m_texture_asset->GetData(); if (!asset) @@ -38,11 +41,15 @@ Resource::TaskComplete TextureDataResource::CollectPrimaryData() void TextureDataResource::MarkAsActive() { + if (!m_texture_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetActive(m_texture_asset); } void TextureDataResource::MarkAsPending() { + if (!m_texture_asset) [[unlikely]] + return; m_resource_context.asset_cache->MarkAssetPending(m_texture_asset); } } // namespace VideoCommon