aboutsummaryrefslogtreecommitdiff
path: root/Spv.Generator/Instruction.cs
diff options
context:
space:
mode:
authorNicholas Rodine <halfofastaple@gmail.com>2022-08-17 18:49:43 -0500
committerGitHub <noreply@github.com>2022-08-18 01:49:43 +0200
commit80a879cb447507822e19acb0e51e123b768acd61 (patch)
tree9af35446532b44cdaa794ad2de3b70f20e5471c1 /Spv.Generator/Instruction.cs
parent2197f41506e1ed7c4c657a1899491298bd66f7f9 (diff)
Fix SpirV parse failure (#3597)
* Added .ToString overrides, to help diagnose and debug SpirV generated code. * Added Spirv to team shared dictionary, so the word will not show up as a warning. * Fixed bug where we were creating invalid constants (bool 0i and float 0i) * Update Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Update Spv.Generator/Instruction.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Adjusted spacing to match style of the rest of the code. * Added handler for FP64(double) as well, for undefined aggregate types. * Made the operand labels a static dictionary, to avoid re-allocation on each call. Replaced Contains/Get with a TryGetValue, to reduce the number of dictionary lookups. * Added newline between AllOperands and ToString(). Co-authored-by: gdkchan <gab.dark.100@gmail.com>
Diffstat (limited to 'Spv.Generator/Instruction.cs')
-rw-r--r--Spv.Generator/Instruction.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/Spv.Generator/Instruction.cs b/Spv.Generator/Instruction.cs
index 27190f05..8ecfe683 100644
--- a/Spv.Generator/Instruction.cs
+++ b/Spv.Generator/Instruction.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -228,5 +229,19 @@ namespace Spv.Generator
{
return obj is Instruction instruction && Equals(instruction);
}
+
+ private static readonly Dictionary<Specification.Op, string[]> _operandLabels = new()
+ {
+ { Specification.Op.OpConstant, new [] { "Value" } },
+ { Specification.Op.OpTypeInt, new [] { "Width", "Signed" } },
+ { Specification.Op.OpTypeFloat, new [] { "Width" } }
+ };
+
+ public override string ToString()
+ {
+ var labels = _operandLabels.TryGetValue(Opcode, out var opLabels) ? opLabels : Array.Empty<string>();
+ var result = _resultType == null ? string.Empty : $"{_resultType} ";
+ return $"{result}{Opcode}{_operands.ToString(labels)}";
+ }
}
}