H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1208 from Hexagon12/pred-comp-14

Browse Source 
Add predicate comparison 14 (GreaterEqualWithNan)
This commit is contained in:
bunnei 2018-08-31 11:20:47 -04:00 committed by GitHub
commit e205e74e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 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

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

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

@ -729,8 +729,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, ">"}, {PredCondition::GreaterThanWithNan, ">"}, {PredCondition::GreaterEqualWithNan, ">="}};
};
const auto& comparison{PredicateComparisonStrings.find(condition)}; const auto& comparison{PredicateComparisonStrings.find(condition)};
ASSERT_MSG(comparison != PredicateComparisonStrings.end(), ASSERT_MSG(comparison != PredicateComparisonStrings.end(),
@ -739,7 +738,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) { condition == PredCondition::GreaterThanWithNan ||
condition == PredCondition::GreaterEqualWithNan) {
predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')'; predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')';
} }