Rebase Changes

This commit is contained in:
Isaac Marovitz 2024-05-29 16:38:11 +01:00 committed by Isaac Marovitz
parent ba07a8c603
commit d323a8d44a
3 changed files with 18 additions and 2 deletions

View file

@ -305,7 +305,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
private static string GetSamplerName(ShaderProperties resourceDefinitions, AstTextureOperation textOp)
{
return resourceDefinitions.Textures[textOp.Binding].Name;
return resourceDefinitions.Textures[textOp.GetTextureSetAndBinding()].Name;
}
private static string GetMaskMultiDest(int mask)
@ -362,7 +362,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
}
else
{
context.Properties.Textures.TryGetValue(texOp.Binding, out TextureDefinition definition);
context.Properties.Textures.TryGetValue(texOp.GetTextureSetAndBinding(), out TextureDefinition definition);
bool hasLod = !definition.Type.HasFlag(SamplerType.Multisample) && (definition.Type & SamplerType.Mask) != SamplerType.TextureBuffer;
texCall += "get_";