diff options
author | Hexagon12 <Hexagon12@users.noreply.github.com> | 2018-11-23 17:51:32 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-11-23 17:51:32 +0100 |
commit | 3135dbc29c4c2be5c491376f45b84cbee6098788 (patch) | |
tree | b527203c96c4895dcbceba7a5981a30b20c2eabb /src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |
parent | Merge pull request #1756 from ReinUsesLisp/fix-textures (diff) | |
download | yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar.gz yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar.bz2 yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar.lz yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar.xz yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.tar.zst yuzu-3135dbc29c4c2be5c491376f45b84cbee6098788.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index dd406b132..ba80e5832 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1059,11 +1059,17 @@ 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::LessThanWithNan, "<"}, {PredCondition::NotEqualWithNan, "!="}, - {PredCondition::GreaterThanWithNan, ">"}, {PredCondition::GreaterEqualWithNan, ">="}}; + {PredCondition::LessThan, "<"}, + {PredCondition::Equal, "=="}, + {PredCondition::LessEqual, "<="}, + {PredCondition::GreaterThan, ">"}, + {PredCondition::NotEqual, "!="}, + {PredCondition::GreaterEqual, ">="}, + {PredCondition::LessThanWithNan, "<"}, + {PredCondition::NotEqualWithNan, "!="}, + {PredCondition::LessEqualWithNan, "<="}, + {PredCondition::GreaterThanWithNan, ">"}, + {PredCondition::GreaterEqualWithNan, ">="}}; const auto& comparison{PredicateComparisonStrings.find(condition)}; UNIMPLEMENTED_IF_MSG(comparison == PredicateComparisonStrings.end(), @@ -1072,6 +1078,7 @@ private: std::string predicate{'(' + op_a + ") " + comparison->second + " (" + op_b + ')'}; if (condition == PredCondition::LessThanWithNan || condition == PredCondition::NotEqualWithNan || + condition == PredCondition::LessEqualWithNan || condition == PredCondition::GreaterThanWithNan || condition == PredCondition::GreaterEqualWithNan) { predicate += " || isnan(" + op_a + ") || isnan(" + op_b + ')'; |