yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

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
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/shader_recompiler/frontend/ir/opcodes.inc
View File

@ -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, )