From 81e6ad829862198e6fc508d6f97c369e7252abac Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Tue, 23 Jun 2020 05:44:39 -0700 Subject: [PATCH] nir/vtn: Handle LessOrGreater deprecated opcode Reviewed-by Boris Brezillon Reviewed-by: Alyssa Rosenzweig Reviewed-by: Karol Herbst Part-of: --- src/compiler/spirv/vtn_alu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index 794f82eac44..41be1a18dc8 100644 --- a/src/compiler/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c @@ -281,6 +281,7 @@ vtn_nir_alu_op_for_spirv_opcode(struct vtn_builder *b, case SpvOpFOrdEqual: return nir_op_feq; case SpvOpFUnordEqual: return nir_op_feq; case SpvOpINotEqual: return nir_op_ine; + case SpvOpLessOrGreater: /* Deprecated, use OrdNotEqual */ case SpvOpFOrdNotEqual: return nir_op_fne; case SpvOpFUnordNotEqual: return nir_op_fne; case SpvOpULessThan: return nir_op_ult; @@ -548,6 +549,7 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, break; } + case SpvOpLessOrGreater: case SpvOpFOrdNotEqual: { /* For all the SpvOpFOrd* comparisons apart from NotEqual, the value * from the ALU will probably already be false if the operands are not -- 2.30.2