misc: chore: Merge duplicated 'if' branches

This commit is contained in:
KeatonTheBot
2025-09-24 13:26:50 -05:00
parent 6e5bd0c9f2
commit 9c37a557dd
22 changed files with 77 additions and 313 deletions
+5 -17
View File
@@ -1187,12 +1187,8 @@ namespace Ryujinx.Graphics.Gpu.Image
return matchQuality;
}
if (!TextureCompatibility.LayoutMatches(Info, info))
{
return TextureMatchQuality.NoMatch;
}
if (!TextureCompatibility.SizeMatches(Info, info, forSampler))
if (!TextureCompatibility.LayoutMatches(Info, info)
|| !TextureCompatibility.SizeMatches(Info, info, forSampler))
{
return TextureMatchQuality.NoMatch;
}
@@ -1277,17 +1273,9 @@ namespace Ryujinx.Graphics.Gpu.Image
int offset = Range.FindOffset(range);
if (offset < 0 || !_sizeInfo.FindView(offset, out firstLayer, out firstLevel))
{
return TextureViewCompatibility.LayoutIncompatible;
}
if (!TextureCompatibility.ViewLayoutCompatible(Info, info, firstLevel))
{
return TextureViewCompatibility.LayoutIncompatible;
}
if (info.GetSlices() > 1 && LayerSize != layerSize)
if (offset < 0 || !_sizeInfo.FindView(offset, out firstLayer, out firstLevel) ||
!TextureCompatibility.ViewLayoutCompatible(Info, info, firstLevel) ||
info.GetSlices() > 1 && LayerSize != layerSize)
{
return TextureViewCompatibility.LayoutIncompatible;
}