summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-03-30 08:19:50 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:25 +0200
commit514a6b07eedace58b4a0c95282bdfc729623d1d9 (patch)
treeb384c882fa5e24ce9a0a2d287076d23949b3e266 /src
parentshader: Fix indirect branches to scheduler instructions (diff)
downloadyuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.gz
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.bz2
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.lz
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.xz
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.tar.zst
yuzu-514a6b07eedace58b4a0c95282bdfc729623d1d9.zip
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv.cpp3
-rw-r--r--src/shader_recompiler/frontend/ir/microinstruction.cpp4
-rw-r--r--src/shader_recompiler/frontend/ir/value.cpp6
3 files changed, 11 insertions, 2 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index 2e7e6bb0c..6389d80bf 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -288,7 +288,8 @@ Id EmitPhi(EmitContext& ctx, IR::Inst* inst) {
operands.push_back(PhiArgDef(ctx, inst, index));
operands.push_back(inst->PhiBlock(index)->Definition<Id>());
}
- const Id result_type{TypeId(ctx, inst->Arg(0).Type())};
+ // The type of a phi instruction is stored in its flags
+ const Id result_type{TypeId(ctx, inst->Flags<IR::Type>())};
return ctx.OpPhi(result_type, std::span(operands.data(), operands.size()));
}
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) {
if (!value.IsImmediate()) {
Use(value);
}
+ if (Flags<IR::Type>() == IR::Type::Void) {
+ // Set the type of the phi node
+ SetFlags<IR::Type>(value.Type());
+ }
phi_args.emplace_back(predecessor, value);
}
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 {
}
IR::Type Value::Type() const noexcept {
- if (IsIdentity() || IsPhi()) {
+ if (IsPhi()) {
+ // The type of a phi node is stored in its flags
+ return inst->Flags<IR::Type>();
+ }
+ if (IsIdentity()) {
return inst->Arg(0).Type();
}
if (type == Type::Opaque) {