nvir/nir: add support for 8 and 16 bit conversion

1 files changed, 17 insertions, 1 deletions

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
index d731c4141b..afab1b29af 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -354,16 +354,24 @@ Converter::getOperation(nir_op op)
       return OP_COS;
    case nir_op_f2f32:
    case nir_op_f2f64:
+   case nir_op_f2i8:
+   case nir_op_f2i16:
    case nir_op_f2i32:
    case nir_op_f2i64:
+   case nir_op_f2u8:
+   case nir_op_f2u16:
    case nir_op_f2u32:
    case nir_op_f2u64:
    case nir_op_i2f32:
    case nir_op_i2f64:
+   case nir_op_i2i8:
+   case nir_op_i2i16:
    case nir_op_i2i32:
    case nir_op_i2i64:
    case nir_op_u2f32:
    case nir_op_u2f64:
+   case nir_op_u2u8:
+   case nir_op_u2u16:
    case nir_op_u2u32:
    case nir_op_u2u64:
       return OP_CVT;
@@ -2558,18 +2566,26 @@ Converter::visit(nir_alu_instr *insn)
    /* convert instructions */
    CASE_OPFIU(2f32):
    CASE_OPFIU(2f64):
+   case nir_op_f2i8:
+   case nir_op_f2i16:
    case nir_op_f2i32:
    case nir_op_f2i64:
+   case nir_op_f2u8:
+   case nir_op_f2u16:
    case nir_op_f2u32:
    case nir_op_f2u64:
+   case nir_op_i2i8:
+   case nir_op_i2i16:
    case nir_op_i2i32:
    case nir_op_i2i64:
+   case nir_op_u2u8:
+   case nir_op_u2u16:
    case nir_op_u2u32:
    case nir_op_u2u64: {
       DEFAULT_CHECKS;
       LValues &newDefs = convert(&insn->dest);
       Instruction *i = mkOp1(getOperation(op), dType, newDefs[0], getSrc(&insn->src[0]));
-      if (op == nir_op_f2i32 || op == nir_op_f2i64 || op == nir_op_f2u32 || op == nir_op_f2u64)
+      if (::isFloatType(sTypes[0]) && !::isFloatType(dType))
          i->rnd = ROUND_Z;
       i->sType = sTypes[0];
       break;