diff options
| author |  ReinUsesLisp | 2021-03-13 02:23:26 -0300 |
|---|---|---|
| committer |  ameerj | 2021-07-22 21:51:23 -0400 |
| commit | 2d422b2498868e297939c6907a7ef1386ceb1d57 (patch) | |
| tree | 91bb2ee321a707275b9a942f33f13221ed60cb0f | |
| parent | shader: Implement FCMP (diff) | |
| download | yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.gz yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.tar.xz yuzu-2d422b2498868e297939c6907a7ef1386ceb1d57.zip | |
shader: Fix rebase issue
Diffstat (limited to '')
| -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 476281789..9052a4903 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, | |||
| 197 | OPCODE(FPTrunc32, F32, F32, ) | 197 | OPCODE(FPTrunc32, F32, F32, ) |
| 198 | OPCODE(FPTrunc64, F64, F64, ) | 198 | OPCODE(FPTrunc64, F64, F64, ) |
| 199 | 199 | ||
| 200 | <<<<<<< HEAD | ||
| 201 | OPCODE(FPOrdEqual16, U1, F16, F16, ) | 200 | OPCODE(FPOrdEqual16, U1, F16, F16, ) |
| 202 | OPCODE(FPOrdEqual32, U1, F32, F32, ) | 201 | OPCODE(FPOrdEqual32, U1, F32, F32, ) |
| 203 | OPCODE(FPOrdEqual64, U1, F64, F64, ) | 202 | OPCODE(FPOrdEqual64, U1, F64, F64, ) |