2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

shader: Fix rebase issue

This commit is contained in:
ReinUsesLisp 2021-03-13 02:23:26 -03:00 committed by ameerj
parent ba8c1d2eb4
commit 2d422b2498

View file

@ -197,7 +197,6 @@ OPCODE(FPTrunc16, F16, F16,
OPCODE(FPTrunc32, F32, F32, ) OPCODE(FPTrunc32, F32, F32, )
OPCODE(FPTrunc64, F64, F64, ) OPCODE(FPTrunc64, F64, F64, )
<<<<<<< HEAD
OPCODE(FPOrdEqual16, U1, F16, F16, ) OPCODE(FPOrdEqual16, U1, F16, F16, )
OPCODE(FPOrdEqual32, U1, F32, F32, ) OPCODE(FPOrdEqual32, U1, F32, F32, )
OPCODE(FPOrdEqual64, U1, F64, F64, ) OPCODE(FPOrdEqual64, U1, F64, F64, )