Browse Source

Added predicate comparison GreaterEqualWithNan

nce_cpp
Hexagon12 7 years ago
parent
commit
7afccb51a2
  1. 1
      src/video_core/engines/shader_bytecode.h
  2. 6
      src/video_core/renderer_opengl/gl_shader_decompiler.cpp

1
src/video_core/engines/shader_bytecode.h

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

6
src/video_core/renderer_opengl/gl_shader_decompiler.cpp

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

Loading…
Cancel
Save