nir/spirv: Stop wrapping carry/borrow in b2i

The upstream versions now return an integer like GLSL/SPIR-V want.

diff --git a/src/glsl/nir/spirv/vtn_alu.c b/src/glsl/nir/spirv/vtn_alu.c
index 70875007ec71d10baa4e928680f3f9a4efba2384..f1bca439d87b55fb6a6205773237371589e8c882 100644 (file)
--- a/src/glsl/nir/spirv/vtn_alu.c
+++ b/src/glsl/nir/spirv/vtn_alu.c
@@ -309,15 +309,13 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode,
    case SpvOpIAddCarry:
       assert(glsl_type_is_struct(val->ssa->type));
       val->ssa->elems[0]->def = nir_iadd(&b->nb, src[0], src[1]);
-      val->ssa->elems[1]->def =
-         nir_b2i(&b->nb, nir_uadd_carry(&b->nb, src[0], src[1]));
+      val->ssa->elems[1]->def = nir_uadd_carry(&b->nb, src[0], src[1]);
       return;
 
    case SpvOpISubBorrow:
       assert(glsl_type_is_struct(val->ssa->type));
       val->ssa->elems[0]->def = nir_isub(&b->nb, src[0], src[1]);
-      val->ssa->elems[1]->def =
-         nir_b2i(&b->nb, nir_usub_borrow(&b->nb, src[0], src[1]));
+      val->ssa->elems[1]->def = nir_usub_borrow(&b->nb, src[0], src[1]);
       return;
 
    case SpvOpUMulExtended: