diff --git a/Source/Core/VideoCommon/Assets/CustomAsset.cpp b/Source/Core/VideoCommon/Assets/CustomAsset.cpp index 60c7f1ee12..ab82f03a95 100644 --- a/Source/Core/VideoCommon/Assets/CustomAsset.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAsset.cpp @@ -19,10 +19,10 @@ std::size_t CustomAsset::Load() const auto load_time = ClockType::now(); const auto load_information = LoadImpl(m_asset_id); - if (load_information.m_bytes_loaded > 0) + if (load_information.bytes_loaded > 0) { std::lock_guard lk(m_info_lock); - m_bytes_loaded = load_information.m_bytes_loaded; + m_bytes_loaded = load_information.bytes_loaded; m_last_loaded_time = load_time; return m_bytes_loaded; } diff --git a/Source/Core/VideoCommon/Assets/CustomAssetLibrary.h b/Source/Core/VideoCommon/Assets/CustomAssetLibrary.h index 32fac4fdf6..2ab8da408c 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetLibrary.h +++ b/Source/Core/VideoCommon/Assets/CustomAssetLibrary.h @@ -27,7 +27,7 @@ public: struct LoadInfo { - std::size_t m_bytes_loaded = 0; + std::size_t bytes_loaded = 0; }; virtual ~CustomAssetLibrary() = default; diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp index a9f2940deb..f69c884f35 100644 --- a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp +++ b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp @@ -384,7 +384,7 @@ CustomAssetLibrary::LoadInfo MaterialAsset::LoadImpl(const CustomAssetLibrary::A { auto potential_data = std::make_shared(); const auto loaded_info = m_owning_library->LoadMaterial(asset_id, potential_data.get()); - if (loaded_info.m_bytes_loaded == 0) + if (loaded_info.bytes_loaded == 0) return {}; { std::lock_guard lk(m_data_lock); diff --git a/Source/Core/VideoCommon/Assets/MeshAsset.cpp b/Source/Core/VideoCommon/Assets/MeshAsset.cpp index 05a4ba0961..bde8c8aab6 100644 --- a/Source/Core/VideoCommon/Assets/MeshAsset.cpp +++ b/Source/Core/VideoCommon/Assets/MeshAsset.cpp @@ -651,7 +651,7 @@ CustomAssetLibrary::LoadInfo MeshAsset::LoadImpl(const CustomAssetLibrary::Asset { auto potential_data = std::make_shared(); const auto loaded_info = m_owning_library->LoadMesh(asset_id, potential_data.get()); - if (loaded_info.m_bytes_loaded == 0) + if (loaded_info.bytes_loaded == 0) return {}; { std::lock_guard lk(m_data_lock); diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp index dbe4c5cb02..50a4a8c95d 100644 --- a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp +++ b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp @@ -439,7 +439,7 @@ CustomAssetLibrary::LoadInfo PixelShaderAsset::LoadImpl(const CustomAssetLibrary { auto potential_data = std::make_shared(); const auto loaded_info = m_owning_library->LoadPixelShader(asset_id, potential_data.get()); - if (loaded_info.m_bytes_loaded == 0) + if (loaded_info.bytes_loaded == 0) return {}; { std::lock_guard lk(m_data_lock); diff --git a/Source/Core/VideoCommon/Assets/TextureAsset.cpp b/Source/Core/VideoCommon/Assets/TextureAsset.cpp index 0b3deecca7..fc6c865f76 100644 --- a/Source/Core/VideoCommon/Assets/TextureAsset.cpp +++ b/Source/Core/VideoCommon/Assets/TextureAsset.cpp @@ -258,7 +258,7 @@ CustomAssetLibrary::LoadInfo TextureAsset::LoadImpl(const CustomAssetLibrary::As { auto potential_data = std::make_shared(); const auto loaded_info = m_owning_library->LoadTexture(asset_id, potential_data.get()); - if (loaded_info.m_bytes_loaded == 0) + if (loaded_info.bytes_loaded == 0) return {}; { std::lock_guard lk(m_data_lock);