diff options
| author | Mat M <mathew1800@gmail.com> | 2020-04-15 09:16:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 09:16:56 +0200 |
| commit | 50c0a92db8d72879b73b0d8a08ff3633e1b4dda7 (patch) | |
| tree | 696e10403e644283b81799e07933327bdd2a58af | |
| parent | Merge pull request #3664 from ReinUsesLisp/fe3h-black-squares (diff) | |
| parent | shader/arithmetic: Add FCMP_CR variant (diff) | |
| download | yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar.gz yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar.bz2 yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar.lz yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar.xz yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.tar.zst yuzu-50c0a92db8d72879b73b0d8a08ff3633e1b4dda7.zip | |
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 6 | ||||
| -rw-r--r-- | src/video_core/shader/decode/arithmetic.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index c66c66f6c..430ee86ba 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -1871,7 +1871,8 @@ public: ICMP_R, ICMP_CR, ICMP_IMM, - FCMP_R, + FCMP_RR, + FCMP_RC, MUFU, // Multi-Function Operator RRO_C, // Range Reduction Operator RRO_R, @@ -2179,7 +2180,8 @@ private: INST("0101110100100---", Id::HSETP2_R, Type::HalfSetPredicate, "HSETP2_R"), INST("0111111-0-------", Id::HSETP2_IMM, Type::HalfSetPredicate, "HSETP2_IMM"), INST("0101110100011---", Id::HSET2_R, Type::HalfSet, "HSET2_R"), - INST("010110111010----", Id::FCMP_R, Type::Arithmetic, "FCMP_R"), + INST("010110111010----", Id::FCMP_RR, Type::Arithmetic, "FCMP_RR"), + INST("010010111010----", Id::FCMP_RC, Type::Arithmetic, "FCMP_RC"), INST("0101000010000---", Id::MUFU, Type::Arithmetic, "MUFU"), INST("0100110010010---", Id::RRO_C, Type::Arithmetic, "RRO_C"), INST("0101110010010---", Id::RRO_R, Type::Arithmetic, "RRO_R"), diff --git a/src/video_core/shader/decode/arithmetic.cpp b/src/video_core/shader/decode/arithmetic.cpp index 478394682..4db329fa5 100644 --- a/src/video_core/shader/decode/arithmetic.cpp +++ b/src/video_core/shader/decode/arithmetic.cpp @@ -136,7 +136,8 @@ u32 ShaderIR::DecodeArithmetic(NodeBlock& bb, u32 pc) { SetRegister(bb, instr.gpr0, value); break; } - case OpCode::Id::FCMP_R: { + case OpCode::Id::FCMP_RR: + case OpCode::Id::FCMP_RC: { UNIMPLEMENTED_IF(instr.fcmp.ftz == 0); Node op_c = GetRegister(instr.gpr39); Node comp = GetPredicateComparisonFloat(instr.fcmp.cond, std::move(op_c), Immediate(0.0f)); |