dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-20 23:25:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

shader: Fix rebase issue

Browse source
This commit is contained in:
ReinUsesLisp 2021-03-13 02:23:26 -03:00 • committed by ameerj
parent ab928b72c0
commit f99fd4d0c9
1 changed files with 0 additions and 1 deletions
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, )