aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-09-01 03:58:40 -0300
committerGitHub <noreply@github.com>2020-09-01 16:58:40 +1000
commitbdfbcf4017c97d16531bfde70613a0aaa3759f52 (patch)
treed4e71b6a66f814ab0da68979460c65501b758009
parentbc19114bb5a14f4563aa4bee68bda97234a7bcb0 (diff)
Fix regression on texture compatibility match checks (#1521)
-rw-r--r--Ryujinx.Graphics.Gpu/Image/Texture.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs
index 2a61b441..50b184d5 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 b64a85a5..cc7b0dc2 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())
{