gallivm: fix incorrect floor(), itrunc()

LLVMBuildFPTrunc() should be used for double->float conversion, not
float->int conversion.

There should be a better way to compute floor(), ceil(), etc that doesn't
involve float->int->float conversion.

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
index aa47338b323f842f407e532d697301b54bed0f6f..c39b062d10ea0898363f2b7a1a7bf317ed02c96e 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
@@ -930,7 +930,10 @@ lp_build_floor(struct lp_build_context *bld,
    assert(type.floating);
 
    if (type.length == 1) {
    assert(type.floating);
 
    if (type.length == 1) {

-      return LLVMBuildFPTrunc(bld->builder, a, LLVMFloatType(), "");
+      LLVMValueRef res;
+      res = lp_build_ifloor(bld, a);
+      res = LLVMBuildSIToFP(bld->builder, res, LLVMFloatType(), "");
+      return res;

    }
 
    if(util_cpu_caps.has_sse4_1)
    }
 
    if(util_cpu_caps.has_sse4_1)


@@ -993,7 +996,7 @@ lp_build_itrunc(struct lp_build_context *bld,
 
    if (type.length == 1) {
       LLVMTypeRef int_type = LLVMIntType(type.width);
 
    if (type.length == 1) {
       LLVMTypeRef int_type = LLVMIntType(type.width);

-      return LLVMBuildFPTrunc(bld->builder, a, int_type, "");
+      return LLVMBuildFPToSI(bld->builder, a, int_type, "");

    }
    else {
       LLVMTypeRef int_vec_type = lp_build_int_vec_type(type);
    }
    else {
       LLVMTypeRef int_vec_type = lp_build_int_vec_type(type);