summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHexagon12 <benassdo@gmail.com>2018-08-31 09:40:18 +0200
committerHexagon12 <benassdo@gmail.com>2018-08-31 09:40:18 +0200
commitd626bc8c626bebfbe6cade2cd1d6a3b734d5e477 (patch)
treeed4206a055ad5930abab4cb15418d9ddbe2de826
parentMerge pull request #1195 from FearlessTobi/port-gamelist-compat (diff)
downloadyuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar.gz
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar.bz2
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar.lz
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar.xz
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.tar.zst
yuzu-d626bc8c626bebfbe6cade2cd1d6a3b734d5e477.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h1
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 65e0c469f..3e4efbe0c 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/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
};
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 842bfa0b7..391c92d47 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/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 + ')';
}