deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

InstGenMemory Refactor + Bindless Support

Browse source
This commit is contained in:
Isaac Marovitz 2024-07-31 17:09:24 +01:00 committed by Isaac Marovitz
parent 47b99e6bc3
commit d9025904a7
1 changed files with 87 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
View file

@ -159,8 +159,15 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
var texCallBuilder = new StringBuilder(); var texCallBuilder = new StringBuilder();
string imageName = GetImageName(context.Properties, texOp); int srcIndex = 0;
texCallBuilder.Append($"images.{imageName}");
string Src(AggregateType type)
{
return GetSourceExpr(context, texOp.GetSource(srcIndex++), type);
}
string imageName = GetImageName(context, texOp, ref srcIndex);
texCallBuilder.Append(imageName);
texCallBuilder.Append('.'); texCallBuilder.Append('.');
if (texOp.Inst == Instruction.ImageAtomic) if (texOp.Inst == Instruction.ImageAtomic)
@ -185,13 +192,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
texCallBuilder.Append(texOp.Inst == Instruction.ImageLoad ? "read" : "write"); texCallBuilder.Append(texOp.Inst == Instruction.ImageLoad ? "read" : "write");
} }
int srcIndex = 0;
string Src(AggregateType type)
{
return GetSourceExpr(context, texOp.GetSource(srcIndex++), type);
}
texCallBuilder.Append('('); texCallBuilder.Append('(');
var coordsBuilder = new StringBuilder(); var coordsBuilder = new StringBuilder();
@ -286,7 +286,8 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
int coordsCount = texOp.Type.GetDimensions(); int coordsCount = texOp.Type.GetDimensions();
int coordsIndex = 0; int coordsIndex = 0;
string samplerName = GetSamplerName(context.Properties, texOp); string textureName = GetTextureName(context, texOp, ref coordsIndex);
string samplerName = GetSamplerName(context, texOp, ref coordsIndex);
string coordsExpr; string coordsExpr;
@ -306,8 +307,8 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
coordsExpr = GetSourceExpr(context, texOp.GetSource(coordsIndex), AggregateType.FP32); coordsExpr = GetSourceExpr(context, texOp.GetSource(coordsIndex), AggregateType.FP32);
} }
var clamped = $"textures.tex_{samplerName}.calculate_clamped_lod(textures.samp_{samplerName}, {coordsExpr})"; var clamped = $"{textureName}.calculate_clamped_lod({samplerName}, {coordsExpr})";
var unclamped = $"textures.tex_{samplerName}.calculate_unclamped_lod(textures.samp_{samplerName}, {coordsExpr})"; var unclamped = $"{textureName}.calculate_unclamped_lod({samplerName}, {coordsExpr})";
return $"float2({clamped}, {unclamped}){GetMask(texOp.Index)}"; return $"float2({clamped}, {unclamped}){GetMask(texOp.Index)}";
} }
@ -332,11 +333,9 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
bool isArray = (texOp.Type & SamplerType.Array) != 0; bool isArray = (texOp.Type & SamplerType.Array) != 0;
bool isShadow = (texOp.Type & SamplerType.Shadow) != 0; bool isShadow = (texOp.Type & SamplerType.Shadow) != 0;
bool colorIsVector = isGather || !isShadow; var texCallBuilder = new StringBuilder();
string samplerName = GetSamplerName(context.Properties, texOp); bool colorIsVector = isGather || !isShadow;
string texCall = $"textures.tex_{samplerName}";
texCall += ".";
int srcIndex = 0; int srcIndex = 0;
@ -345,27 +344,33 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
return GetSourceExpr(context, texOp.GetSource(srcIndex++), type); return GetSourceExpr(context, texOp.GetSource(srcIndex++), type);
} }
string textureName = GetTextureName(context, texOp, ref srcIndex);
string samplerName = GetSamplerName(context, texOp, ref srcIndex);
texCallBuilder.Append(textureName);
texCallBuilder.Append('.');
if (intCoords) if (intCoords)
{ {
texCall += "read("; texCallBuilder.Append("read(");
} }
else else
{ {
if (isGather) if (isGather)
{ {
texCall += "gather"; texCallBuilder.Append("gather");
} }
else else
{ {
texCall += "sample"; texCallBuilder.Append("sample");
} }
if (isShadow) if (isShadow)
{ {
texCall += "_compare"; texCallBuilder.Append("_compare");
} }
texCall += $"(textures.samp_{samplerName}, "; texCallBuilder.Append($"({samplerName}, ");
} }
int coordsCount = texOp.Type.GetDimensions(); int coordsCount = texOp.Type.GetDimensions();
@ -377,13 +382,14 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
{ {
if (appended) if (appended)
{ {
texCall += ", "; texCallBuilder.Append(", ");
} }
else else
{ {
appended = true; appended = true;
} }
texCall += str;
texCallBuilder.Append(str);
} }
AggregateType coordType = intCoords ? AggregateType.S32 : AggregateType.FP32; AggregateType coordType = intCoords ? AggregateType.S32 : AggregateType.FP32;
@ -478,19 +484,52 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
} }
} }
texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : ""); texCallBuilder.Append(')');
texCallBuilder.Append(colorIsVector ? GetMaskMultiDest(texOp.Index) : "");
return texCall; return texCallBuilder.ToString();
} }
private static string GetSamplerName(ShaderProperties resourceDefinitions, AstTextureOperation texOp) private static string GetTextureName(CodeGenContext context, AstTextureOperation texOp, ref int srcIndex)
{ {
return resourceDefinitions.Textures[texOp.GetTextureSetAndBinding()].Name; TextureDefinition textureDefinition = context.Properties.Textures[texOp.GetTextureSetAndBinding()];
string name = textureDefinition.Name;
if (textureDefinition.ArrayLength != 1)
{
name = $"{name}[{GetSourceExpr(context, texOp.GetSource(srcIndex++), AggregateType.S32)}]";
} }
private static string GetImageName(ShaderProperties resourceDefinitions, AstTextureOperation texOp) return $"textures.tex_{name}";
}
private static string GetSamplerName(CodeGenContext context, AstTextureOperation texOp, ref int srcIndex)
{ {
return resourceDefinitions.Images[texOp.GetTextureSetAndBinding()].Name; var index = texOp.IsSeparate ? texOp.GetSamplerSetAndBinding() : texOp.GetTextureSetAndBinding();
var sourceIndex = texOp.IsSeparate ? srcIndex++ : srcIndex + 1;
TextureDefinition samplerDefinition = context.Properties.Textures[index];
string name = samplerDefinition.Name;
if (samplerDefinition.ArrayLength != 1)
{
name = $"{name}[{GetSourceExpr(context, texOp.GetSource(sourceIndex), AggregateType.S32)}]";
}
return $"textures.samp_{name}";
}
private static string GetImageName(CodeGenContext context, AstTextureOperation texOp, ref int srcIndex)
{
TextureDefinition definition = context.Properties.Images[texOp.GetTextureSetAndBinding()];
string name = definition.Name;
if (definition.ArrayLength != 1)
{
name = $"{name}[{GetSourceExpr(context, texOp.GetSource(srcIndex++), AggregateType.S32)}]";
}
return $"images.{name}";
} }
private static string GetMaskMultiDest(int mask) private static string GetMaskMultiDest(int mask)
@ -517,67 +556,62 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
{ {
AstTextureOperation texOp = (AstTextureOperation)operation; AstTextureOperation texOp = (AstTextureOperation)operation;
bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0; int srcIndex = 0;
// TODO: Bindless texture support. For now we just return 0. string textureName = GetTextureName(context, texOp, ref srcIndex);
if (isBindless)
{
return NumberFormatter.FormatInt(0);
}
string samplerName = GetSamplerName(context.Properties, texOp); return $"{textureName}.get_num_samples()";
string textureName = $"textures.tex_{samplerName}";
string texCall = textureName + ".";
texCall += "get_num_samples()";
return texCall;
} }
public static string TextureQuerySize(CodeGenContext context, AstOperation operation) public static string TextureQuerySize(CodeGenContext context, AstOperation operation)
{ {
AstTextureOperation texOp = (AstTextureOperation)operation; AstTextureOperation texOp = (AstTextureOperation)operation;
string samplerName = GetSamplerName(context.Properties, texOp); var texCallBuilder = new StringBuilder();
string textureName = $"textures.tex_{samplerName}";
string texCall = textureName + "."; int srcIndex = 0;
string textureName = GetTextureName(context, texOp, ref srcIndex);
texCallBuilder.Append(textureName);
texCallBuilder.Append('.');
if (texOp.Index == 3) if (texOp.Index == 3)
{ {
texCall += "get_num_mip_levels()"; texCallBuilder.Append("get_num_mip_levels()");
} }
else else
{ {
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;
texCall += "get_"; texCallBuilder.Append("get_");
if (texOp.Index == 0) if (texOp.Index == 0)
{ {
texCall += "width"; texCallBuilder.Append("width");
} }
else if (texOp.Index == 1) else if (texOp.Index == 1)
{ {
texCall += "height"; texCallBuilder.Append("height");
} }
else else
{ {
texCall += "depth"; texCallBuilder.Append("depth");
} }
texCall += "("; texCallBuilder.Append('(');
if (hasLod) if (hasLod)
{ {
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));
texCall += $"{lodExpr}"; texCallBuilder.Append(lodExpr);
} }
texCall += ")"; texCallBuilder.Append(')');
} }
return texCall; return texCallBuilder.ToString();
} }
public static string PackHalf2x16(CodeGenContext context, AstOperation operation) public static string PackHalf2x16(CodeGenContext context, AstOperation operation)