daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2025-06-28 23:40:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix shader integer from/to double conversion (#2831)

Browse Source
This commit is contained in:
gdkchan
2021-11-14 21:37:07 -03:00
committed by GitHub
parent 788aec511f
commit b9d83cc97e
7 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Ryujinx.Graphics.Shader/Translation/EmitterContextInsts.cs
View File

@ -241,14 +241,24 @@ namespace Ryujinx.Graphics.Shader.Translation
return context.Add(fpType | Instruction.CompareLess, Local(), a, b);
}
public static Operand FPConvertToS32(this EmitterContext context, Operand a)
public static Operand FP32ConvertToS32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertFPToS32, Local(), a);
return context.Add(Instruction.ConvertFP32ToS32, Local(), a);
}
public static Operand FPConvertToU32(this EmitterContext context, Operand a)
public static Operand FP32ConvertToU32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertFPToU32, Local(), a);
return context.Add(Instruction.ConvertFP32ToU32, Local(), a);
}
public static Operand FP64ConvertToS32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertFP64ToS32, Local(), a);
}
public static Operand FP64ConvertToU32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertFP64ToU32, Local(), a);
}
public static Operand FPCosine(this EmitterContext context, Operand a)
@ -281,9 +291,9 @@ namespace Ryujinx.Graphics.Shader.Translation
return context.Add(Instruction.FP32 | Instruction.LogarithmB2, Local(), a);
}
public static Operand FPMaximum(this EmitterContext context, Operand a, Operand b)
public static Operand FPMaximum(this EmitterContext context, Operand a, Operand b, Instruction fpType = Instruction.FP32)
{
return context.Add(Instruction.FP32 | Instruction.Maximum, Local(), a, b);
return context.Add(fpType | Instruction.Maximum, Local(), a, b);
}
public static Operand FPMinimum(this EmitterContext context, Operand a, Operand b)
@ -461,14 +471,24 @@ namespace Ryujinx.Graphics.Shader.Translation
return context.Add(Instruction.CompareNotEqual, Local(), a, b);
}
public static Operand IConvertS32ToFP(this EmitterContext context, Operand a)
public static Operand IConvertS32ToFP32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertS32ToFP, Local(), a);
return context.Add(Instruction.ConvertS32ToFP32, Local(), a);
}
public static Operand IConvertU32ToFP(this EmitterContext context, Operand a)
public static Operand IConvertS32ToFP64(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertU32ToFP, Local(), a);
return context.Add(Instruction.ConvertS32ToFP64, Local(), a);
}
public static Operand IConvertU32ToFP32(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertU32ToFP32, Local(), a);
}
public static Operand IConvertU32ToFP64(this EmitterContext context, Operand a)
{
return context.Add(Instruction.ConvertU32ToFP64, Local(), a);
}
public static Operand IMaximumS32(this EmitterContext context, Operand a, Operand b)

6
Ryujinx.Graphics.Shader/Translation/Rewriter.cs
View File

@ -286,7 +286,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{
Operand res = Local();
node.List.AddBefore(node, new Operation(Instruction.ConvertFPToS32, res, value));
node.List.AddBefore(node, new Operation(Instruction.ConvertFP32ToS32, res, value));
return res;
}
@ -295,7 +295,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{
Operand res = Local();
node.List.AddBefore(node, new Operation(Instruction.ConvertS32ToFP, res, value));
node.List.AddBefore(node, new Operation(Instruction.ConvertS32ToFP32, res, value));
return res;
}
@ -501,7 +501,7 @@ namespace Ryujinx.Graphics.Shader.Translation
// as replacement for SNORM (which is not supported).
INode[] uses = texOp.Dest.UseOps.ToArray();
Operation convOp = new Operation(Instruction.ConvertS32ToFP, Local(), texOp.Dest);
Operation convOp = new Operation(Instruction.ConvertS32ToFP32, Local(), texOp.Dest);
Operation normOp = new Operation(Instruction.FP32 | Instruction.Multiply, Local(), convOp.Dest, ConstF(1f / maxPositive));
node = node.List.AddAfter(node, convOp);