mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-09 20:35:22 +00:00
shader: Store type of phi nodes in flags
This is needed because pseudo-instructions where invalidated.
This commit is contained in:
parent
b0d5572abf
commit
514a6b07ee
|
@ -288,7 +288,8 @@ Id EmitPhi(EmitContext& ctx, IR::Inst* inst) {
|
||||||
operands.push_back(PhiArgDef(ctx, inst, index));
|
operands.push_back(PhiArgDef(ctx, inst, index));
|
||||||
operands.push_back(inst->PhiBlock(index)->Definition<Id>());
|
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()));
|
return ctx.OpPhi(result_type, std::span(operands.data(), operands.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -193,6 +193,10 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
|
||||||
if (!value.IsImmediate()) {
|
if (!value.IsImmediate()) {
|
||||||
Use(value);
|
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);
|
phi_args.emplace_back(predecessor, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,11 @@ bool Value::IsLabel() const noexcept {
|
||||||
}
|
}
|
||||||
|
|
||||||
IR::Type Value::Type() 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();
|
return inst->Arg(0).Type();
|
||||||
}
|
}
|
||||||
if (type == Type::Opaque) {
|
if (type == Type::Opaque) {
|
||||||
|
|
Loading…
Reference in a new issue