diff options
| -rw-r--r-- | src/video_core/shader/shader_ir.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/shader/shader_ir.cpp b/src/video_core/shader/shader_ir.cpp index ac5112d78..5175f83c6 100644 --- a/src/video_core/shader/shader_ir.cpp +++ b/src/video_core/shader/shader_ir.cpp | |||
| @@ -219,7 +219,7 @@ Node ShaderIR::GetOperandAbsNegHalf(Node value, bool absolute, bool negate) { | |||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | Node ShaderIR::GetPredicateComparisonFloat(PredCondition condition, Node op_a, Node op_b) { | 221 | Node ShaderIR::GetPredicateComparisonFloat(PredCondition condition, Node op_a, Node op_b) { |
| 222 | static const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { | 222 | const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { |
| 223 | {PredCondition::LessThan, OperationCode::LogicalFLessThan}, | 223 | {PredCondition::LessThan, OperationCode::LogicalFLessThan}, |
| 224 | {PredCondition::Equal, OperationCode::LogicalFEqual}, | 224 | {PredCondition::Equal, OperationCode::LogicalFEqual}, |
| 225 | {PredCondition::LessEqual, OperationCode::LogicalFLessEqual}, | 225 | {PredCondition::LessEqual, OperationCode::LogicalFLessEqual}, |
| @@ -255,7 +255,7 @@ Node ShaderIR::GetPredicateComparisonFloat(PredCondition condition, Node op_a, N | |||
| 255 | 255 | ||
| 256 | Node ShaderIR::GetPredicateComparisonInteger(PredCondition condition, bool is_signed, Node op_a, | 256 | Node ShaderIR::GetPredicateComparisonInteger(PredCondition condition, bool is_signed, Node op_a, |
| 257 | Node op_b) { | 257 | Node op_b) { |
| 258 | static const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { | 258 | const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { |
| 259 | {PredCondition::LessThan, OperationCode::LogicalILessThan}, | 259 | {PredCondition::LessThan, OperationCode::LogicalILessThan}, |
| 260 | {PredCondition::Equal, OperationCode::LogicalIEqual}, | 260 | {PredCondition::Equal, OperationCode::LogicalIEqual}, |
| 261 | {PredCondition::LessEqual, OperationCode::LogicalILessEqual}, | 261 | {PredCondition::LessEqual, OperationCode::LogicalILessEqual}, |
| @@ -285,7 +285,6 @@ Node ShaderIR::GetPredicateComparisonInteger(PredCondition condition, bool is_si | |||
| 285 | 285 | ||
| 286 | Node ShaderIR::GetPredicateComparisonHalf(Tegra::Shader::PredCondition condition, | 286 | Node ShaderIR::GetPredicateComparisonHalf(Tegra::Shader::PredCondition condition, |
| 287 | const MetaHalfArithmetic& meta, Node op_a, Node op_b) { | 287 | const MetaHalfArithmetic& meta, Node op_a, Node op_b) { |
| 288 | |||
| 289 | UNIMPLEMENTED_IF_MSG(condition == PredCondition::LessThanWithNan || | 288 | UNIMPLEMENTED_IF_MSG(condition == PredCondition::LessThanWithNan || |
| 290 | condition == PredCondition::NotEqualWithNan || | 289 | condition == PredCondition::NotEqualWithNan || |
| 291 | condition == PredCondition::LessEqualWithNan || | 290 | condition == PredCondition::LessEqualWithNan || |
| @@ -293,7 +292,7 @@ Node ShaderIR::GetPredicateComparisonHalf(Tegra::Shader::PredCondition condition | |||
| 293 | condition == PredCondition::GreaterEqualWithNan, | 292 | condition == PredCondition::GreaterEqualWithNan, |
| 294 | "Unimplemented NaN comparison for half floats"); | 293 | "Unimplemented NaN comparison for half floats"); |
| 295 | 294 | ||
| 296 | static const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { | 295 | const std::unordered_map<PredCondition, OperationCode> PredicateComparisonTable = { |
| 297 | {PredCondition::LessThan, OperationCode::Logical2HLessThan}, | 296 | {PredCondition::LessThan, OperationCode::Logical2HLessThan}, |
| 298 | {PredCondition::Equal, OperationCode::Logical2HEqual}, | 297 | {PredCondition::Equal, OperationCode::Logical2HEqual}, |
| 299 | {PredCondition::LessEqual, OperationCode::Logical2HLessEqual}, | 298 | {PredCondition::LessEqual, OperationCode::Logical2HLessEqual}, |
| @@ -316,7 +315,7 @@ Node ShaderIR::GetPredicateComparisonHalf(Tegra::Shader::PredCondition condition | |||
| 316 | } | 315 | } |
| 317 | 316 | ||
| 318 | OperationCode ShaderIR::GetPredicateCombiner(PredOperation operation) { | 317 | OperationCode ShaderIR::GetPredicateCombiner(PredOperation operation) { |
| 319 | static const std::unordered_map<PredOperation, OperationCode> PredicateOperationTable = { | 318 | const std::unordered_map<PredOperation, OperationCode> PredicateOperationTable = { |
| 320 | {PredOperation::And, OperationCode::LogicalAnd}, | 319 | {PredOperation::And, OperationCode::LogicalAnd}, |
| 321 | {PredOperation::Or, OperationCode::LogicalOr}, | 320 | {PredOperation::Or, OperationCode::LogicalOr}, |
| 322 | {PredOperation::Xor, OperationCode::LogicalXor}, | 321 | {PredOperation::Xor, OperationCode::LogicalXor}, |