Fix array size query

This commit is contained in:
Isaac Marovitz 2024-08-12 14:09:40 +01:00 committed by Isaac Marovitz
parent c7c80dc2fb
commit e928ec9708

View file

@ -605,6 +605,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
{ {
context.Properties.Textures.TryGetValue(texOp.GetTextureSetAndBinding(), 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; bool hasLod = !definition.Type.HasFlag(SamplerType.Multisample) && (definition.Type & SamplerType.Mask) != SamplerType.TextureBuffer;
bool isArray = definition.Type.HasFlag(SamplerType.Array);
texCallBuilder.Append("get_"); texCallBuilder.Append("get_");
if (texOp.Index == 0) if (texOp.Index == 0)
@ -616,13 +617,20 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
texCallBuilder.Append("height"); texCallBuilder.Append("height");
} }
else else
{
if (isArray)
{
texCallBuilder.Append("array_size");
}
else
{ {
texCallBuilder.Append("depth"); texCallBuilder.Append("depth");
} }
}
texCallBuilder.Append('('); texCallBuilder.Append('(');
if (hasLod) if (hasLod && !isArray)
{ {
IAstNode lod = operation.GetSource(0); IAstNode lod = operation.GetSource(0);
string lodExpr = GetSourceExpr(context, lod, GetSrcVarType(operation.Inst, 0)); string lodExpr = GetSourceExpr(context, lod, GetSrcVarType(operation.Inst, 0));