mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-28 01:49:33 -06:00
VideoCommon: rename m_bytes_loaded in asset library to bytes_loaded
This commit is contained in:
@ -19,10 +19,10 @@ std::size_t CustomAsset::Load()
|
|||||||
const auto load_time = ClockType::now();
|
const auto load_time = ClockType::now();
|
||||||
|
|
||||||
const auto load_information = LoadImpl(m_asset_id);
|
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);
|
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;
|
m_last_loaded_time = load_time;
|
||||||
return m_bytes_loaded;
|
return m_bytes_loaded;
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@ public:
|
|||||||
|
|
||||||
struct LoadInfo
|
struct LoadInfo
|
||||||
{
|
{
|
||||||
std::size_t m_bytes_loaded = 0;
|
std::size_t bytes_loaded = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
virtual ~CustomAssetLibrary() = default;
|
virtual ~CustomAssetLibrary() = default;
|
||||||
|
@ -384,7 +384,7 @@ CustomAssetLibrary::LoadInfo MaterialAsset::LoadImpl(const CustomAssetLibrary::A
|
|||||||
{
|
{
|
||||||
auto potential_data = std::make_shared<MaterialData>();
|
auto potential_data = std::make_shared<MaterialData>();
|
||||||
const auto loaded_info = m_owning_library->LoadMaterial(asset_id, potential_data.get());
|
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 {};
|
return {};
|
||||||
{
|
{
|
||||||
std::lock_guard lk(m_data_lock);
|
std::lock_guard lk(m_data_lock);
|
||||||
|
@ -651,7 +651,7 @@ CustomAssetLibrary::LoadInfo MeshAsset::LoadImpl(const CustomAssetLibrary::Asset
|
|||||||
{
|
{
|
||||||
auto potential_data = std::make_shared<MeshData>();
|
auto potential_data = std::make_shared<MeshData>();
|
||||||
const auto loaded_info = m_owning_library->LoadMesh(asset_id, potential_data.get());
|
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 {};
|
return {};
|
||||||
{
|
{
|
||||||
std::lock_guard lk(m_data_lock);
|
std::lock_guard lk(m_data_lock);
|
||||||
|
@ -439,7 +439,7 @@ CustomAssetLibrary::LoadInfo PixelShaderAsset::LoadImpl(const CustomAssetLibrary
|
|||||||
{
|
{
|
||||||
auto potential_data = std::make_shared<PixelShaderData>();
|
auto potential_data = std::make_shared<PixelShaderData>();
|
||||||
const auto loaded_info = m_owning_library->LoadPixelShader(asset_id, potential_data.get());
|
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 {};
|
return {};
|
||||||
{
|
{
|
||||||
std::lock_guard lk(m_data_lock);
|
std::lock_guard lk(m_data_lock);
|
||||||
|
@ -258,7 +258,7 @@ CustomAssetLibrary::LoadInfo TextureAsset::LoadImpl(const CustomAssetLibrary::As
|
|||||||
{
|
{
|
||||||
auto potential_data = std::make_shared<CustomTextureData>();
|
auto potential_data = std::make_shared<CustomTextureData>();
|
||||||
const auto loaded_info = m_owning_library->LoadTexture(asset_id, potential_data.get());
|
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 {};
|
return {};
|
||||||
{
|
{
|
||||||
std::lock_guard lk(m_data_lock);
|
std::lock_guard lk(m_data_lock);
|
||||||
|
Reference in New Issue
Block a user