Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-20 01:15:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

VideoCommon: add TextureAndSamplerAsset, this asset contains both the raw texture data and data about how the texture should be sampled

Browse Source
This commit is contained in:
iwubcode
2025-08-20 19:17:37 -05:00
parent 90a137ffdc
commit 4489ea0ec2
5 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp
View File

@@ -66,8 +66,8 @@ bool LoadMips(const std::filesystem::path& asset_path, CustomTextureData::ArrayS
}
} // namespace
bool LoadTextureDataFromFile(const CustomAssetLibrary::AssetID& asset_id,
const std::filesystem::path& asset_path,
TextureAndSamplerData::Type type, CustomTextureData* data)
const std::filesystem::path& asset_path, AbstractTextureType type,
CustomTextureData* data)
{
auto ext = PathToString(asset_path.extension());
Common::ToLower(&ext);
@@ -92,7 +92,7 @@ bool LoadTextureDataFromFile(const CustomAssetLibrary::AssetID& asset_id,
{
// PNG could support more complicated texture types in the future
// but for now just error
if (type != TextureAndSamplerData::Type::Type_Texture2D)
if (type != AbstractTextureType::Texture_2D)
{
ERROR_LOG_FMT(VIDEO, "Asset '{}' error - PNG is not supported for texture type '{}'!",
asset_id, type);