Merge pull request #11930 from iwubcode/game_texture_validation

VideoCommon: don't reject game textures which have the wrong size

1 files changed, 8 insertions, 4 deletions

diff --git a/Source/Core/VideoCommon/Assets/TextureAsset.cpp b/Source/Core/VideoCommon/Assets/TextureAsset.cpp
index 0715dc6492..3bf477a58a 100644
--- a/Source/Core/VideoCommon/Assets/TextureAsset.cpp
+++ b/Source/Core/VideoCommon/Assets/TextureAsset.cpp
@@ -60,24 +60,28 @@ bool GameTextureAsset::Validate(u32 native_width, u32 native_height) const
   const VideoCommon::CustomTextureData::Level& first_mip = m_data->m_levels[0];
   if (first_mip.width * native_height != first_mip.height * native_width)
   {
-    ERROR_LOG_FMT(
+    // Note: this feels like this should return an error but
+    // for legacy reasons this is only a notice that something *could*
+    // go wrong
+    WARN_LOG_FMT(
         VIDEO,
         "Invalid custom texture size {}x{} for game texture asset '{}'. The aspect differs "
         "from the native size {}x{}.",
         first_mip.width, first_mip.height, GetAssetId(), native_width, native_height);
-    return false;
   }
 
   // Same deal if the custom texture isn't a multiple of the native size.
   if (native_width != 0 && native_height != 0 &&
       (first_mip.width % native_width || first_mip.height % native_height))
   {
-    ERROR_LOG_FMT(
+    // Note: this feels like this should return an error but
+    // for legacy reasons this is only a notice that something *could*
+    // go wrong
+    WARN_LOG_FMT(
         VIDEO,
         "Invalid custom texture size {}x{} for game texture asset '{}'. Please use an integer "
         "upscaling factor based on the native size {}x{}.",
         first_mip.width, first_mip.height, GetAssetId(), native_width, native_height);
-    return false;
   }
 
   return true;