diff options
| author | 2020-04-14 19:11:04 -0300 | |
|---|---|---|
| committer | 2020-04-14 19:11:04 -0300 | |
| commit | fefe7f18f9d626386340057402a2a29d69ae55c4 (patch) | |
| tree | 06177753b792bd2bd25d8151bf54eab662003004 /src | |
| parent | Merge pull request #3660 from bunnei/friend-blocked-users (diff) | |
| download | yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.gz yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.xz yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.zip | |
shader/arithmetic: Add FCMP_CR variant
Adds another variant of FCMP.
Diffstat (limited to 'src')
| -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: | |||
| 1871 | ICMP_R, | 1871 | ICMP_R, |
| 1872 | ICMP_CR, | 1872 | ICMP_CR, |
| 1873 | ICMP_IMM, | 1873 | ICMP_IMM, |
| 1874 | FCMP_R, | 1874 | FCMP_RR, |
| 1875 | FCMP_RC, | ||
| 1875 | MUFU, // Multi-Function Operator | 1876 | MUFU, // Multi-Function Operator |
| 1876 | RRO_C, // Range Reduction Operator | 1877 | RRO_C, // Range Reduction Operator |
| 1877 | RRO_R, | 1878 | RRO_R, |
| @@ -2179,7 +2180,8 @@ private: | |||
| 2179 | INST("0101110100100---", Id::HSETP2_R, Type::HalfSetPredicate, "HSETP2_R"), | 2180 | INST("0101110100100---", Id::HSETP2_R, Type::HalfSetPredicate, "HSETP2_R"), |
| 2180 | INST("0111111-0-------", Id::HSETP2_IMM, Type::HalfSetPredicate, "HSETP2_IMM"), | 2181 | INST("0111111-0-------", Id::HSETP2_IMM, Type::HalfSetPredicate, "HSETP2_IMM"), |
| 2181 | INST("0101110100011---", Id::HSET2_R, Type::HalfSet, "HSET2_R"), | 2182 | INST("0101110100011---", Id::HSET2_R, Type::HalfSet, "HSET2_R"), |
| 2182 | INST("010110111010----", Id::FCMP_R, Type::Arithmetic, "FCMP_R"), | 2183 | INST("010110111010----", Id::FCMP_RR, Type::Arithmetic, "FCMP_RR"), |
| 2184 | INST("010010111010----", Id::FCMP_RC, Type::Arithmetic, "FCMP_RC"), | ||
| 2183 | INST("0101000010000---", Id::MUFU, Type::Arithmetic, "MUFU"), | 2185 | INST("0101000010000---", Id::MUFU, Type::Arithmetic, "MUFU"), |
| 2184 | INST("0100110010010---", Id::RRO_C, Type::Arithmetic, "RRO_C"), | 2186 | INST("0100110010010---", Id::RRO_C, Type::Arithmetic, "RRO_C"), |
| 2185 | INST("0101110010010---", Id::RRO_R, Type::Arithmetic, "RRO_R"), | 2187 | 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) { | |||
| 136 | SetRegister(bb, instr.gpr0, value); | 136 | SetRegister(bb, instr.gpr0, value); |
| 137 | break; | 137 | break; |
| 138 | } | 138 | } |
| 139 | case OpCode::Id::FCMP_R: { | 139 | case OpCode::Id::FCMP_RR: |
| 140 | case OpCode::Id::FCMP_RC: { | ||
| 140 | UNIMPLEMENTED_IF(instr.fcmp.ftz == 0); | 141 | UNIMPLEMENTED_IF(instr.fcmp.ftz == 0); |
| 141 | Node op_c = GetRegister(instr.gpr39); | 142 | Node op_c = GetRegister(instr.gpr39); |
| 142 | Node comp = GetPredicateComparisonFloat(instr.fcmp.cond, std::move(op_c), Immediate(0.0f)); | 143 | Node comp = GetPredicateComparisonFloat(instr.fcmp.cond, std::move(op_c), Immediate(0.0f)); |