summaryrefslogtreecommitdiff
path: root/src/shader_recompiler/frontend
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2021-03-30 03:19:50 -0300
committerGravatar ameerj2021-07-22 21:51:25 -0400
commit514a6b07eedace58b4a0c95282bdfc729623d1d9 (patch)
treeb384c882fa5e24ce9a0a2d287076d23949b3e266 /src/shader_recompiler/frontend
parentshader: Fix indirect branches to scheduler instructions (diff)
downloadyuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.gz
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.xz
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.zip
shader: Store type of phi nodes in flags
This is needed because pseudo-instructions where invalidated.
Diffstat (limited to 'src/shader_recompiler/frontend')
-rw-r--r--src/shader_recompiler/frontend/ir/microinstruction.cpp4
-rw-r--r--src/shader_recompiler/frontend/ir/value.cpp6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/shader_recompiler/frontend/ir/microinstruction.cpp b/src/shader_recompiler/frontend/ir/microinstruction.cpp
index c3ba6b522..074c71d53 100644
--- a/src/shader_recompiler/frontend/ir/microinstruction.cpp
+++ b/src/shader_recompiler/frontend/ir/microinstruction.cpp
@@ -193,6 +193,10 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
193 if (!value.IsImmediate()) { 193 if (!value.IsImmediate()) {
194 Use(value); 194 Use(value);
195 } 195 }
196 if (Flags<IR::Type>() == IR::Type::Void) {
197 // Set the type of the phi node
198 SetFlags<IR::Type>(value.Type());
199 }
196 phi_args.emplace_back(predecessor, value); 200 phi_args.emplace_back(predecessor, value);
197} 201}
198 202
diff --git a/src/shader_recompiler/frontend/ir/value.cpp b/src/shader_recompiler/frontend/ir/value.cpp
index e8e4662e7..837c1b487 100644
--- a/src/shader_recompiler/frontend/ir/value.cpp
+++ b/src/shader_recompiler/frontend/ir/value.cpp
@@ -56,7 +56,11 @@ bool Value::IsLabel() const noexcept {
56} 56}
57 57
58IR::Type Value::Type() const noexcept { 58IR::Type Value::Type() const noexcept {
59 if (IsIdentity() || IsPhi()) { 59 if (IsPhi()) {
60 // The type of a phi node is stored in its flags
61 return inst->Flags<IR::Type>();
62 }
63 if (IsIdentity()) {
60 return inst->Arg(0).Type(); 64 return inst->Arg(0).Type();
61 } 65 }
62 if (type == Type::Opaque) { 66 if (type == Type::Opaque) {