summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-04-15 00:11:04 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-04-15 00:11:04 +0200
commitfefe7f18f9d626386340057402a2a29d69ae55c4 (patch)
tree06177753b792bd2bd25d8151bf54eab662003004
parentMerge pull request #3660 from bunnei/friend-blocked-users (diff)
downloadyuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.gz
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.bz2
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.lz
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.xz
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.tar.zst
yuzu-fefe7f18f9d626386340057402a2a29d69ae55c4.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h6
-rw-r--r--src/video_core/shader/decode/arithmetic.cpp3
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));