From bdfbcf4017c97d16531bfde70613a0aaa3759f52 Mon Sep 17 00:00:00 2001 From: gdkchan <gab.dark.100@gmail.com> Date: Tue, 1 Sep 2020 03:58:40 -0300 Subject: [PATCH] Fix regression on texture compatibility match checks (#1521) --- Ryujinx.Graphics.Gpu/Image/Texture.cs | 2 +- Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index 2a61b441c6..50b184d518 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -676,7 +676,7 @@ namespace Ryujinx.Graphics.Gpu.Image return false; } - if (!TextureCompatibility.SizeMatches(Info, info)) + if (!TextureCompatibility.SizeMatches(Info, info, (flags & TextureSearchFlags.Strict) == 0)) { return false; } diff --git a/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs b/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs index b64a85a5d4..cc7b0dc275 100644 --- a/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs +++ b/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs @@ -203,7 +203,7 @@ namespace Ryujinx.Graphics.Gpu.Image /// <param name="rhs">Texture information to compare with</param> /// <param name="alignSizes">True to align the sizes according to the texture layout for comparison</param> /// <returns>True if the sizes matches, false otherwise</returns> - private static bool SizeMatches(TextureInfo lhs, TextureInfo rhs, bool alignSizes) + public static bool SizeMatches(TextureInfo lhs, TextureInfo rhs, bool alignSizes) { if (lhs.GetLayers() != rhs.GetLayers()) {