octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added predcondition GreaterThanWithNan

This commit is contained in:
David Marcec 2018-08-18 17:49:59 +10:00
parent 504cff2b7a
commit 63dff47e22
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_core/engines/shader_bytecode.h
View File

@ -141,6 +141,7 @@ enum class PredCondition : u64 {
NotEqual = 5, NotEqual = 5,
GreaterEqual = 6, GreaterEqual = 6,
LessThanWithNan = 9, LessThanWithNan = 9,
GreaterThanWithNan = 12,
NotEqualWithNan = 13, NotEqualWithNan = 13,
// TODO(Subv): Other condition types // TODO(Subv): Other condition types
}; };

4
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -707,6 +707,7 @@ private:
{PredCondition::LessEqual, "<="}, {PredCondition::GreaterThan, ">"}, {PredCondition::LessEqual, "<="}, {PredCondition::GreaterThan, ">"},
{PredCondition::NotEqual, "!="}, {PredCondition::GreaterEqual, ">="}, {PredCondition::NotEqual, "!="}, {PredCondition::GreaterEqual, ">="},
{PredCondition::LessThanWithNan, "<"}, {PredCondition::NotEqualWithNan, "!="}, {PredCondition::LessThanWithNan, "<"}, {PredCondition::NotEqualWithNan, "!="},
{PredCondition::GreaterThanWithNan, ">"},
}; };
const auto& comparison{PredicateComparisonStrings.find(condition)}; const auto& comparison{PredicateComparisonStrings.find(condition)};
@ -715,7 +716,8 @@ private:
std::string predicate{'(' + op_a + ") " + comparison->second + " (" + op_b + ')'}; std::string predicate{'(' + op_a + ") " + comparison->second + " (" + op_b + ')'};
if (condition == PredCondition::LessThanWithNan || if (condition == PredCondition::LessThanWithNan ||
condition == PredCondition::NotEqualWithNan) { condition == PredCondition::NotEqualWithNan ||
condition == PredCondition::GreaterThanWithNan) {
predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')'; predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')';
} }