From 4489ea0ec29b91564de2e1b3a3ad0b2092dd2202 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 20 Aug 2025 19:17:37 -0500 Subject: VideoCommon: add TextureAndSamplerAsset, this asset contains both the raw texture data and data about how the texture should be sampled --- Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp') diff --git a/Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp b/Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp index 5285c61bba..4d2316081e 100644 --- a/Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp +++ b/Source/Core/VideoCommon/Assets/TextureAssetUtils.cpp @@ -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); -- cgit v1.2.3