yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

ShaderCache: Fix Phi Nodes Type on OGL.

This commit is contained in:
Fernando Sahmkow 2021-11-01 22:26:17 +01:00
parent c50ad56bf5
commit 194579bc4f
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shader_recompiler/backend/glsl/emit_glsl_special.cpp
View File

@ -68,7 +68,7 @@ void EmitPhi(EmitContext& ctx, IR::Inst& phi) {
} }
if (!phi.Definition<Id>().is_valid) { if (!phi.Definition<Id>().is_valid) {
// The phi node wasn't forward defined // The phi node wasn't forward defined
ctx.var_alloc.PhiDefine(phi, phi.Arg(0).Type()); ctx.var_alloc.PhiDefine(phi, phi.Type());
} }
} }
@ -80,7 +80,7 @@ void EmitReference(EmitContext& ctx, const IR::Value& value) {
void EmitPhiMove(EmitContext& ctx, const IR::Value& phi_value, const IR::Value& value) { void EmitPhiMove(EmitContext& ctx, const IR::Value& phi_value, const IR::Value& value) {
IR::Inst& phi{*phi_value.InstRecursive()}; IR::Inst& phi{*phi_value.InstRecursive()};
const auto phi_type{phi.Arg(0).Type()}; const auto phi_type{phi.Type()};
if (!phi.Definition<Id>().is_valid) { if (!phi.Definition<Id>().is_valid) {
// The phi node wasn't forward defined // The phi node wasn't forward defined
ctx.var_alloc.PhiDefine(phi, phi_type); ctx.var_alloc.PhiDefine(phi, phi_type);

4
src/shader_recompiler/frontend/ir/microinstruction.cpp
View File

@ -254,6 +254,10 @@ Inst* Inst::GetAssociatedPseudoOperation(IR::Opcode opcode) {
} }
IR::Type Inst::Type() const { IR::Type Inst::Type() const {
if (op == IR::Opcode::Phi) {
// The type of a phi node is stored in its flags
return Flags<IR::Type>();
}
return TypeOf(op); return TypeOf(op);
} }

24
src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
View File

@ -14,6 +14,7 @@
// https://link.springer.com/chapter/10.1007/978-3-642-37051-9_6 // https://link.springer.com/chapter/10.1007/978-3-642-37051-9_6
// //
#include <deque>
#include <span> #include <span>
#include <variant> #include <variant>
#include <vector> #include <vector>
@ -370,6 +371,26 @@ void VisitBlock(Pass& pass, IR::Block* block) {
} }
pass.SealBlock(block); pass.SealBlock(block);
} }
IR::Type GetConcreteType(IR::Inst* inst) {
std::deque<IR::Inst*> queue;
queue.push_back(inst);
while (!queue.empty()) {
IR::Inst* current = queue.front();
queue.pop_front();
const size_t num_args{current->NumArgs()};
for (size_t i = 0; i < num_args; ++i) {
const auto set_type = current->Arg(i).Type();
if (set_type != IR::Type::Opaque) {
return set_type;
}
if (!current->Arg(i).IsImmediate()) {
queue.push_back(current->Arg(i).Inst());
}
}
}
return IR::Type::Opaque;
}
} // Anonymous namespace } // Anonymous namespace
void SsaRewritePass(IR::Program& program) { void SsaRewritePass(IR::Program& program) {
@ -381,6 +402,9 @@ void SsaRewritePass(IR::Program& program) {
for (auto block = program.post_order_blocks.rbegin(); block != end; ++block) { for (auto block = program.post_order_blocks.rbegin(); block != end; ++block) {
for (IR::Inst& inst : (*block)->Instructions()) { for (IR::Inst& inst : (*block)->Instructions()) {
if (inst.GetOpcode() == IR::Opcode::Phi) { if (inst.GetOpcode() == IR::Opcode::Phi) {
if (inst.Type() == IR::Type::Opaque) {
inst.SetFlags(GetConcreteType(&inst));
}
inst.OrderPhiArgs(); inst.OrderPhiArgs();
} }
} }