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

Add workaround for conditional exit, and fix half float instruction with constant buffer

Browse source
This commit is contained in:
gdkchan 2019-04-09 23:53:50 -03:00
parent e341640c8f
commit fa5ef1a34b
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx.Graphics/Shader/Decoders/Decoder.cs
View file

@ -307,6 +307,11 @@ namespace Ryujinx.Graphics.Shader.Decoders
private static bool IsUnconditional(OpCode opCode)
{
if (opCode is OpCodeExit op && op.Condition != Condition.Always)
{
return false;
}
return opCode.Predicate.Index == RegisterConsts.PredicateTrueIndex && !opCode.InvertPredicate;
}

4
Ryujinx.Graphics/Shader/Decoders/OpCodeExit.cs
View file

@ -4,9 +4,11 @@ namespace Ryujinx.Graphics.Shader.Decoders
{
class OpCodeExit : OpCode
{
public Condition Condition { get; }
public OpCodeExit(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
{
Condition = (Condition)opCode.Extract(0, 5);
}
}
}

9
Ryujinx.Graphics/Shader/Instructions/InstEmitFArith.cs
View file

@ -292,20 +292,19 @@ namespace Ryujinx.Graphics.Shader.Instructions
FPHalfSwizzle swizzle = FPHalfSwizzle.FP16;
if (!(op is IOpCodeImm))
{
swizzle = (FPHalfSwizzle)op.RawOpCode.Extract(28, 2);
}
bool absoluteB = false, negateB = false;
if (op is IOpCodeReg)
{
swizzle = (FPHalfSwizzle)op.RawOpCode.Extract(28, 2);
absoluteB = op.RawOpCode.Extract(30);
negateB = op.RawOpCode.Extract(31);
}
else if (op is IOpCodeCbuf)
{
swizzle = FPHalfSwizzle.FP32;
absoluteB = op.RawOpCode.Extract(54);
}

9
Ryujinx.Graphics/Shader/Instructions/InstEmitFlow.cs
View file

@ -17,7 +17,14 @@ namespace Ryujinx.Graphics.Shader.Instructions
public static void Exit(EmitterContext context)
{
context.Return();
OpCodeExit op = (OpCodeExit)context.CurrOp;
//TODO: Figure out how this is supposed to work in the
//presence of other condition codes.
if (op.Condition == Condition.Always)
{
context.Return();
}
}
public static void Kil(EmitterContext context)