mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-19 21:52:22 +00:00
Implement CSET and CSETP shader instructions (#4318)
* Implement CSET and CSETP shader instructions * Shader cache version bump * Fix CC.HI
This commit is contained in:
parent
2747f12591
commit
6adf15e479
|
@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
|
||||||
private const ushort FileFormatVersionMajor = 1;
|
private const ushort FileFormatVersionMajor = 1;
|
||||||
private const ushort FileFormatVersionMinor = 2;
|
private const ushort FileFormatVersionMinor = 2;
|
||||||
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
|
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
|
||||||
private const uint CodeGenVersion = 3939;
|
private const uint CodeGenVersion = 4318;
|
||||||
|
|
||||||
private const string SharedTocFileName = "shared.toc";
|
private const string SharedTocFileName = "shared.toc";
|
||||||
private const string SharedDataFileName = "shared.data";
|
private const string SharedDataFileName = "shared.data";
|
||||||
|
|
|
@ -91,6 +91,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
|
||||||
Neu = 13,
|
Neu = 13,
|
||||||
Geu = 14,
|
Geu = 14,
|
||||||
T = 15,
|
T = 15,
|
||||||
|
Off = 16,
|
||||||
Lo = 17,
|
Lo = 17,
|
||||||
Sff = 18,
|
Sff = 18,
|
||||||
Ls = 19,
|
Ls = 19,
|
||||||
|
|
|
@ -54,13 +54,6 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||||
context.Config.GpuAccessor.Log("Shader instruction Cctlt is not implemented.");
|
context.Config.GpuAccessor.Log("Shader instruction Cctlt is not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Cset(EmitterContext context)
|
|
||||||
{
|
|
||||||
InstCset op = context.GetOp<InstCset>();
|
|
||||||
|
|
||||||
context.Config.GpuAccessor.Log("Shader instruction Cset is not implemented.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Cs2r(EmitterContext context)
|
public static void Cs2r(EmitterContext context)
|
||||||
{
|
{
|
||||||
InstCs2r op = context.GetOp<InstCs2r>();
|
InstCs2r op = context.GetOp<InstCs2r>();
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
using Ryujinx.Graphics.Shader.Decoders;
|
||||||
|
using Ryujinx.Graphics.Shader.IntermediateRepresentation;
|
||||||
|
using Ryujinx.Graphics.Shader.Translation;
|
||||||
|
|
||||||
|
using static Ryujinx.Graphics.Shader.Instructions.InstEmitAluHelper;
|
||||||
|
using static Ryujinx.Graphics.Shader.Instructions.InstEmitHelper;
|
||||||
|
using static Ryujinx.Graphics.Shader.IntermediateRepresentation.OperandHelper;
|
||||||
|
|
||||||
|
namespace Ryujinx.Graphics.Shader.Instructions
|
||||||
|
{
|
||||||
|
static partial class InstEmit
|
||||||
|
{
|
||||||
|
public static void Cset(EmitterContext context)
|
||||||
|
{
|
||||||
|
InstCset op = context.GetOp<InstCset>();
|
||||||
|
|
||||||
|
Operand res = GetCondition(context, op.Ccc);
|
||||||
|
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
|
||||||
|
|
||||||
|
res = GetPredLogicalOp(context, op.Bop, res, srcPred);
|
||||||
|
|
||||||
|
Operand dest = GetDest(op.Dest);
|
||||||
|
|
||||||
|
if (op.BVal)
|
||||||
|
{
|
||||||
|
context.Copy(dest, context.ConditionalSelect(res, ConstF(1), Const(0)));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
context.Copy(dest, res);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: CC.
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Csetp(EmitterContext context)
|
||||||
|
{
|
||||||
|
InstCsetp op = context.GetOp<InstCsetp>();
|
||||||
|
|
||||||
|
Operand p0Res = GetCondition(context, op.Ccc);
|
||||||
|
Operand p1Res = context.BitwiseNot(p0Res);
|
||||||
|
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
|
||||||
|
|
||||||
|
p0Res = GetPredLogicalOp(context, op.Bop, p0Res, srcPred);
|
||||||
|
p1Res = GetPredLogicalOp(context, op.Bop, p1Res, srcPred);
|
||||||
|
|
||||||
|
context.Copy(Register(op.DestPred, RegisterType.Predicate), p0Res);
|
||||||
|
context.Copy(Register(op.DestPredInv, RegisterType.Predicate), p1Res);
|
||||||
|
|
||||||
|
// TODO: CC.
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Operand GetCondition(EmitterContext context, Ccc cond, int defaultCond = IrConsts.True)
|
||||||
|
{
|
||||||
|
return cond switch
|
||||||
|
{
|
||||||
|
Ccc.F => Const(IrConsts.False),
|
||||||
|
Ccc.Lt => context.BitwiseExclusiveOr(context.BitwiseAnd(GetNF(), context.BitwiseNot(GetZF())), GetVF()),
|
||||||
|
Ccc.Eq => context.BitwiseAnd(context.BitwiseNot(GetNF()), GetZF()),
|
||||||
|
Ccc.Le => context.BitwiseExclusiveOr(GetNF(), context.BitwiseOr(GetZF(), GetVF())),
|
||||||
|
Ccc.Gt => context.BitwiseNot(context.BitwiseOr(context.BitwiseExclusiveOr(GetNF(), GetVF()), GetZF())),
|
||||||
|
Ccc.Ne => context.BitwiseNot(GetZF()),
|
||||||
|
Ccc.Ge => context.BitwiseNot(context.BitwiseExclusiveOr(GetNF(), GetVF())),
|
||||||
|
Ccc.Num => context.BitwiseNot(context.BitwiseAnd(GetNF(), GetZF())),
|
||||||
|
Ccc.Nan => context.BitwiseAnd(GetNF(), GetZF()),
|
||||||
|
Ccc.Ltu => context.BitwiseExclusiveOr(GetNF(), GetVF()),
|
||||||
|
Ccc.Equ => GetZF(),
|
||||||
|
Ccc.Leu => context.BitwiseOr(context.BitwiseExclusiveOr(GetNF(), GetVF()), GetZF()),
|
||||||
|
Ccc.Gtu => context.BitwiseExclusiveOr(context.BitwiseNot(GetNF()), context.BitwiseOr(GetVF(), GetZF())),
|
||||||
|
Ccc.Neu => context.BitwiseOr(GetNF(), context.BitwiseNot(GetZF())),
|
||||||
|
Ccc.Geu => context.BitwiseExclusiveOr(context.BitwiseOr(context.BitwiseNot(GetNF()), GetZF()), GetVF()),
|
||||||
|
Ccc.T => Const(IrConsts.True),
|
||||||
|
Ccc.Off => context.BitwiseNot(GetVF()),
|
||||||
|
Ccc.Lo => context.BitwiseNot(GetCF()),
|
||||||
|
Ccc.Sff => context.BitwiseNot(GetNF()),
|
||||||
|
Ccc.Ls => context.BitwiseOr(GetZF(), context.BitwiseNot(GetCF())),
|
||||||
|
Ccc.Hi => context.BitwiseAnd(GetCF(), context.BitwiseNot(GetZF())),
|
||||||
|
Ccc.Sft => GetNF(),
|
||||||
|
Ccc.Hs => GetCF(),
|
||||||
|
Ccc.Oft => GetVF(),
|
||||||
|
Ccc.Rle => context.BitwiseOr(GetNF(), GetZF()),
|
||||||
|
Ccc.Rgt => context.BitwiseNot(context.BitwiseOr(GetNF(), GetZF())),
|
||||||
|
_ => Const(defaultCond)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -257,7 +257,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// TODO: Support CC here aswell (condition).
|
// TODO: Support CC here as well (condition).
|
||||||
foreach (SyncTarget target in targets.Values)
|
foreach (SyncTarget target in targets.Values)
|
||||||
{
|
{
|
||||||
PushOpInfo pushOpInfo = target.PushOpInfo;
|
PushOpInfo pushOpInfo = target.PushOpInfo;
|
||||||
|
@ -318,21 +318,5 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||||
context.BranchIfTrue(label, pred);
|
context.BranchIfTrue(label, pred);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Operand GetCondition(EmitterContext context, Ccc cond, int defaultCond = IrConsts.True)
|
|
||||||
{
|
|
||||||
// TODO: More condition codes, figure out how they work.
|
|
||||||
switch (cond)
|
|
||||||
{
|
|
||||||
case Ccc.Eq:
|
|
||||||
case Ccc.Equ:
|
|
||||||
return GetZF();
|
|
||||||
case Ccc.Ne:
|
|
||||||
case Ccc.Neu:
|
|
||||||
return context.BitwiseNot(GetZF());
|
|
||||||
}
|
|
||||||
|
|
||||||
return Const(defaultCond);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -11,23 +11,6 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||||
{
|
{
|
||||||
static partial class InstEmit
|
static partial class InstEmit
|
||||||
{
|
{
|
||||||
public static void Csetp(EmitterContext context)
|
|
||||||
{
|
|
||||||
InstCsetp op = context.GetOp<InstCsetp>();
|
|
||||||
|
|
||||||
// TODO: Implement that properly.
|
|
||||||
|
|
||||||
Operand p0Res = Const(IrConsts.True);
|
|
||||||
Operand p1Res = context.BitwiseNot(p0Res);
|
|
||||||
Operand srcPred = GetPredicate(context, op.SrcPred, op.SrcPredInv);
|
|
||||||
|
|
||||||
p0Res = GetPredLogicalOp(context, op.Bop, p0Res, srcPred);
|
|
||||||
p1Res = GetPredLogicalOp(context, op.Bop, p1Res, srcPred);
|
|
||||||
|
|
||||||
context.Copy(Register(op.DestPred, RegisterType.Predicate), p0Res);
|
|
||||||
context.Copy(Register(op.DestPredInv, RegisterType.Predicate), p1Res);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void IcmpR(EmitterContext context)
|
public static void IcmpR(EmitterContext context)
|
||||||
{
|
{
|
||||||
InstIcmpR op = context.GetOp<InstIcmpR>();
|
InstIcmpR op = context.GetOp<InstIcmpR>();
|
||||||
|
|
Loading…
Reference in a new issue