diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2021-01-31 21:13:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 11:13:38 +1100 |
| commit | 053dcfdb0572da9c03d4343a82ac69ac44e3276b (patch) | |
| tree | 07c381d42fe44c1bc7e7c5daa61bce3427ebf9e3 /Ryujinx.Graphics.Shader/Translation | |
| parent | f93089a64f9586863e8a261af932d125e78230df (diff) | |
Use multiple dest operands for shader call instructions (#1975)
* Use multiple dest operands for shader call instructions
* Passing opNode is no longer needed
Diffstat (limited to 'Ryujinx.Graphics.Shader/Translation')
4 files changed, 15 insertions, 11 deletions
diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs index 9a0815c3..61b1544f 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs @@ -289,7 +289,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations case Instruction.AtomicSwap: case Instruction.AtomicXor: case Instruction.Call: - case Instruction.CallOutArgument: return true; } } @@ -306,7 +305,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations for (int index = 0; index < node.DestsCount; index++) { - if (node.GetDest(index).Type != OperandType.LocalVariable) + Operand dest = node.GetDest(index); + + if (dest != null && dest.Type != OperandType.LocalVariable) { return false; } @@ -319,7 +320,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { for (int index = 0; index < node.DestsCount; index++) { - if (node.GetDest(index).UseOps.Count != 0) + Operand dest = node.GetDest(index); + + if (dest != null && dest.UseOps.Count != 0) { return false; } diff --git a/Ryujinx.Graphics.Shader/Translation/RegisterUsage.cs b/Ryujinx.Graphics.Shader/Translation/RegisterUsage.cs index fd90391f..158ba5ef 100644 --- a/Ryujinx.Graphics.Shader/Translation/RegisterUsage.cs +++ b/Ryujinx.Graphics.Shader/Translation/RegisterUsage.cs @@ -299,21 +299,23 @@ namespace Ryujinx.Graphics.Shader.Translation var fru = frus[funcId.Value]; - Operand[] regs = new Operand[fru.InArguments.Length]; + Operand[] inRegs = new Operand[fru.InArguments.Length]; for (int i = 0; i < fru.InArguments.Length; i++) { - regs[i] = OperandHelper.Register(fru.InArguments[i]); + inRegs[i] = OperandHelper.Register(fru.InArguments[i]); } - operation.AppendOperands(regs); + operation.AppendSources(inRegs); + + Operand[] outRegs = new Operand[1 + fru.OutArguments.Length]; for (int i = 0; i < fru.OutArguments.Length; i++) { - Operation callOutArgOp = new Operation(Instruction.CallOutArgument, OperandHelper.Register(fru.OutArguments[i])); - - node = block.Operations.AddAfter(node, callOutArgOp); + outRegs[1 + i] = OperandHelper.Register(fru.OutArguments[i]); } + + operation.AppendDests(outRegs); } } } diff --git a/Ryujinx.Graphics.Shader/Translation/Ssa.cs b/Ryujinx.Graphics.Shader/Translation/Ssa.cs index ff812e64..ff0fa2b7 100644 --- a/Ryujinx.Graphics.Shader/Translation/Ssa.cs +++ b/Ryujinx.Graphics.Shader/Translation/Ssa.cs @@ -120,7 +120,7 @@ namespace Ryujinx.Graphics.Shader.Translation { Operand dest = operation.GetDest(index); - if (dest.Type == OperandType.Register) + if (dest != null && dest.Type == OperandType.Register) { Operand local = Local(); diff --git a/Ryujinx.Graphics.Shader/Translation/Translator.cs b/Ryujinx.Graphics.Shader/Translation/Translator.cs index 85a46d19..e52c1ccf 100644 --- a/Ryujinx.Graphics.Shader/Translation/Translator.cs +++ b/Ryujinx.Graphics.Shader/Translation/Translator.cs @@ -88,7 +88,6 @@ namespace Ryujinx.Graphics.Shader.Translation RegisterUsage.FixupCalls(cfg.Blocks, frus); Dominance.FindDominators(cfg); - Dominance.FindDominanceFrontiers(cfg.Blocks); Ssa.Rename(cfg.Blocks); |