summaryrefslogtreecommitdiffstats
path: root/src/shader_recompiler/frontend
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-03-13 06:23:26 +0100
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:23 +0200
commit2d422b2498868e297939c6907a7ef1386ceb1d57 (patch)
tree91bb2ee321a707275b9a942f33f13221ed60cb0f /src/shader_recompiler/frontend
parentshader: Implement FCMP (diff)
downloadyuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.gz
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.bz2
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.lz
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.xz
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.zst
yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.zip
Diffstat (limited to 'src/shader_recompiler/frontend')
-rw-r--r--src/shader_recompiler/frontend/ir/opcodes.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc
index 476281789..9052a4903 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.inc
+++ b/src/shader_recompiler/frontend/ir/opcodes.inc
@@ -197,7 +197,6 @@ OPCODE(FPTrunc16, F16, F16,
OPCODE(FPTrunc32, F32, F32, )
OPCODE(FPTrunc64, F64, F64, )
-<<<<<<< HEAD
OPCODE(FPOrdEqual16, U1, F16, F16, )
OPCODE(FPOrdEqual32, U1, F32, F32, )
OPCODE(FPOrdEqual64, U1, F64, F64, )