diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-12 20:03:45 -0400 | 
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-07-12 20:04:35 -0400 | 
| commit | 49c0c081c47fd0b56f4e026e8a6998dff20b32c4 (patch) | |
| tree | 33f0ff56853da10fdf3ce33e9ce7d82cd6dc74b9 | |
| parent | 274d1fb0fc3d9397a468f191a0c15afc9c86f94c (diff) | |
gl_shader_decompiler: Implement PredCondition::LessThanWithNan.
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 11 | 
2 files changed, 7 insertions, 5 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index ab978c2e2..77c465694 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -142,6 +142,7 @@ enum class PredCondition : u64 {      GreaterThan = 4,      NotEqual = 5,      GreaterEqual = 6, +    LessThanWithNan = 9,      NotEqualWithNan = 13,      // TODO(Subv): Other condition types  }; diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index c29cabb84..c1efca23b 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -728,10 +728,10 @@ private:                                         const std::string& op_a, const std::string& op_b) const {          using Tegra::Shader::PredCondition;          static const std::unordered_map<PredCondition, const char*> PredicateComparisonStrings = { -            {PredCondition::LessThan, "<"},         {PredCondition::Equal, "=="}, -            {PredCondition::LessEqual, "<="},       {PredCondition::GreaterThan, ">"}, -            {PredCondition::NotEqual, "!="},        {PredCondition::GreaterEqual, ">="}, -            {PredCondition::NotEqualWithNan, "!="}, +            {PredCondition::LessThan, "<"},        {PredCondition::Equal, "=="}, +            {PredCondition::LessEqual, "<="},      {PredCondition::GreaterThan, ">"}, +            {PredCondition::NotEqual, "!="},       {PredCondition::GreaterEqual, ">="}, +            {PredCondition::LessThanWithNan, "<"}, {PredCondition::NotEqualWithNan, "!="},          };          const auto& comparison{PredicateComparisonStrings.find(condition)}; @@ -739,7 +739,8 @@ private:                     "Unknown predicate comparison operation");          std::string predicate{'(' + op_a + ") " + comparison->second + " (" + op_b + ')'}; -        if (condition == PredCondition::NotEqualWithNan) { +        if (condition == PredCondition::LessThanWithNan || +            condition == PredCondition::NotEqualWithNan) {              predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')';          }  | 
