shader: Fix rebase issue

pull/8/head
ReinUsesLisp 4 years ago committed by ameerj
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…
Cancel
Save