hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Shader_IR: Correct OutwardMoves for Ifs

This commit is contained in:
Fernando Sahmkow 2019-09-23 08:10:29 -04:00 committed by FernandoS27
parent 100a4bd988
commit 5ea740beb5
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_core/shader/ast.cpp
View File

@ -685,12 +685,10 @@ void ASTManager::MoveOutward(ASTNode goto_node) {
const ASTNode break_node = ASTBase::Make<ASTBreak>(parent, var_condition); const ASTNode break_node = ASTBase::Make<ASTBreak>(parent, var_condition);
zipper.InsertAfter(break_node, var_node); zipper.InsertAfter(break_node, var_node);
} else if (is_if || is_else) { } else if (is_if || is_else) {
if (post) {
const u32 var_index = NewVariable(); const u32 var_index = NewVariable();
const Expr var_condition = MakeExpr<ExprVar>(var_index); const Expr var_condition = MakeExpr<ExprVar>(var_index);
const ASTNode var_node = ASTBase::Make<ASTVarSet>(parent, var_index, condition); const ASTNode var_node = ASTBase::Make<ASTVarSet>(parent, var_index, condition);
const ASTNode var_node_init = const ASTNode var_node_init = ASTBase::Make<ASTVarSet>(parent, var_index, false_condition);
ASTBase::Make<ASTVarSet>(parent, var_index, false_condition);
if (is_if) { if (is_if) {
zipper2.InsertBefore(var_node_init, parent); zipper2.InsertBefore(var_node_init, parent);
} else { } else {
@ -698,21 +696,12 @@ void ASTManager::MoveOutward(ASTNode goto_node) {
} }
zipper.InsertAfter(var_node, prev); zipper.InsertAfter(var_node, prev);
goto_node->SetGotoCondition(var_condition); goto_node->SetGotoCondition(var_condition);
if (post) {
zipper.DetachTail(post); zipper.DetachTail(post);
const ASTNode if_node = ASTBase::Make<ASTIfThen>(parent, MakeExprNot(var_condition)); const ASTNode if_node = ASTBase::Make<ASTIfThen>(parent, MakeExprNot(var_condition));
ASTZipper* sub_zipper = if_node->GetSubNodes(); ASTZipper* sub_zipper = if_node->GetSubNodes();
sub_zipper->Init(post, if_node); sub_zipper->Init(post, if_node);
zipper.InsertAfter(if_node, var_node); zipper.InsertAfter(if_node, var_node);
} else {
Expr if_condition;
if (is_if) {
if_condition = parent->GetIfCondition();
} else {
ASTNode if_node = parent->GetPrevious();
if_condition = MakeExprNot(if_node->GetIfCondition());
}
Expr new_condition = MakeExprAnd(if_condition, condition);
goto_node->SetGotoCondition(new_condition);
} }
} else { } else {
UNREACHABLE(); UNREACHABLE();