From 3e27fc7c0b66524843f8b26dfa1538f387769c41 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Sun, 11 Jun 2023 21:28:08 -0500 Subject: [PATCH] VideoCommon: don't treat incorrect aspect ratio or sizes that aren't a multiple of native textures as an error --- Source/Core/VideoCommon/Assets/TextureAsset.cpp | 12 ++++++++---- 1 file 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;