artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

shader: Fix dependency on identity removal pass

Browse source
This commit is contained in:
ReinUsesLisp 2021-04-01 01:07:51 -03:00 committed by ameerj
parent 5f22cd89e2
commit f1dd743731
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shader_recompiler/backend/spirv/emit_context.cpp
View file

@ -114,7 +114,7 @@ EmitContext::~EmitContext() = default;
Id EmitContext::Def(const IR::Value& value) { Id EmitContext::Def(const IR::Value& value) {
if (!value.IsImmediate()) { if (!value.IsImmediate()) {
return value.Inst()->Definition<Id>(); return value.InstRecursive()->Definition<Id>();
} }
switch (value.Type()) { switch (value.Type()) {
case IR::Type::Void: case IR::Type::Void:

9
src/shader_recompiler/backend/spirv/emit_spirv.cpp
View file

@ -250,7 +250,7 @@ Id PhiArgDef(EmitContext& ctx, IR::Inst* inst, size_t index) {
// Let the context handle immediate definitions, as it already knows how // Let the context handle immediate definitions, as it already knows how
return ctx.Def(arg); return ctx.Def(arg);
} }
IR::Inst* const arg_inst{arg.Inst()}; IR::Inst* const arg_inst{arg.InstRecursive()};
if (const Id def{arg_inst->Definition<Id>()}; Sirit::ValidId(def)) { if (const Id def{arg_inst->Definition<Id>()}; Sirit::ValidId(def)) {
// Return the current definition if it exists // Return the current definition if it exists
return def; return def;
@ -296,7 +296,12 @@ Id EmitPhi(EmitContext& ctx, IR::Inst* inst) {
void EmitVoid(EmitContext&) {} void EmitVoid(EmitContext&) {}
Id EmitIdentity(EmitContext& ctx, const IR::Value& value) { Id EmitIdentity(EmitContext& ctx, const IR::Value& value) {
return ctx.Def(value); if (const Id id = ctx.Def(value); Sirit::ValidId(id)) {
return id;
}
const Id def{ctx.ForwardDeclarationId()};
value.InstRecursive()->SetDefinition<Id>(def);
return def;
} }
void EmitGetZeroFromOp(EmitContext&) { void EmitGetZeroFromOp(EmitContext&) {