mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 20:53:23 +02:00
shader: Fix rebase issue
This commit is contained in:
parent
ba8c1d2eb4
commit
2d422b2498
@ -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, )
|
||||
|
Loading…
Reference in New Issue
Block a user