diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-03-13 02:23:26 -0300 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-07-22 21:51:23 -0400 |
| commit | 2d422b2498868e297939c6907a7ef1386ceb1d57 (patch) | |
| tree | 91bb2ee321a707275b9a942f33f13221ed60cb0f /src/shader_recompiler/frontend | |
| parent | ba8c1d2eb479d04b2b0d847efd67468b688765d4 (diff) | |
shader: Fix rebase issue
Diffstat (limited to 'src/shader_recompiler/frontend')
| -rw-r--r-- | src/shader_recompiler/frontend/ir/opcodes.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc index 4762817896..9052a4903d 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.inc +++ b/src/shader_recompiler/frontend/ir/opcodes.inc @@ -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, ) |