Use line number information from entire function expression

[mesa.git] / src / glsl / ir_builder.cpp

diff --git a/src/glsl/ir_builder.cpp b/src/glsl/ir_builder.cpp
index 8fb30a02a99e58cd7c329cf42770c01424a6208d..6c49734bef8eb7ecab2e6d2cb201161cc4cb99e5 100644 (file)
--- a/src/glsl/ir_builder.cpp
+++ b/src/glsl/ir_builder.cpp
@@ -46,13 +46,14 @@ ir_factory::make_temp(const glsl_type *type, const char *name)
 }
 
 ir_assignment *
-assign(deref lhs, operand rhs, int writemask)
+assign(deref lhs, operand rhs, operand condition, int writemask)
 {
    void *mem_ctx = ralloc_parent(lhs.val);
 
    ir_assignment *assign = new(mem_ctx) ir_assignment(lhs.val,
                                                      rhs.val,
-                                                     NULL, writemask);
+                                                      condition.val,
+                                                      writemask);
 
    return assign;
 }
@@ -63,6 +64,25 @@ assign(deref lhs, operand rhs)
    return assign(lhs, rhs, (1 << lhs.val->type->vector_elements) - 1);
 }
 
+ir_assignment *
+assign(deref lhs, operand rhs, int writemask)
+{
+   return assign(lhs, rhs, (ir_rvalue *) NULL, writemask);
+}
+
+ir_assignment *
+assign(deref lhs, operand rhs, operand condition)
+{
+   return assign(lhs, rhs, condition, (1 << lhs.val->type->vector_elements) - 1);
+}
+
+ir_return *
+ret(operand retval)
+{
+   void *mem_ctx = ralloc_parent(retval.val);
+   return new(mem_ctx) ir_return(retval.val);
+}
+
 ir_swizzle *
 swizzle(operand a, int swizzle, int components)
 {
@@ -173,6 +193,14 @@ expr(ir_expression_operation op, operand a, operand b)
    return new(mem_ctx) ir_expression(op, a.val, b.val);
 }
 
+ir_expression *
+expr(ir_expression_operation op, operand a, operand b, operand c)
+{
+   void *mem_ctx = ralloc_parent(a.val);
+
+   return new(mem_ctx) ir_expression(op, a.val, b.val, c.val);
+}
+
 ir_expression *add(operand a, operand b)
 {
    return expr(ir_binop_add, a, b);
@@ -188,11 +216,26 @@ ir_expression *mul(operand a, operand b)
    return expr(ir_binop_mul, a, b);
 }
 
+ir_expression *imul_high(operand a, operand b)
+{
+   return expr(ir_binop_imul_high, a, b);
+}
+
 ir_expression *div(operand a, operand b)
 {
    return expr(ir_binop_div, a, b);
 }
 
+ir_expression *carry(operand a, operand b)
+{
+   return expr(ir_binop_carry, a, b);
+}
+
+ir_expression *borrow(operand a, operand b)
+{
+   return expr(ir_binop_borrow, a, b);
+}
+
 ir_expression *round_even(operand a)
 {
    return expr(ir_unop_round_even, a);
@@ -203,6 +246,17 @@ ir_expression *dot(operand a, operand b)
    return expr(ir_binop_dot, a, b);
 }
 
+/* dot for vectors, mul for scalars */
+ir_expression *dotlike(operand a, operand b)
+{
+   assert(a.val->type == b.val->type);
+
+   if (a.val->type->vector_elements == 1)
+      return expr(ir_binop_mul, a, b);
+
+   return expr(ir_binop_dot, a, b);
+}
+
 ir_expression*
 clamp(operand a, operand b, operand c)
 {
@@ -219,12 +273,72 @@ saturate(operand a)
               new(mem_ctx) ir_constant(0.0f));
 }
 
+ir_expression *
+abs(operand a)
+{
+   return expr(ir_unop_abs, a);
+}
+
+ir_expression *
+neg(operand a)
+{
+   return expr(ir_unop_neg, a);
+}
+
+ir_expression *
+sin(operand a)
+{
+   return expr(ir_unop_sin, a);
+}
+
+ir_expression *
+cos(operand a)
+{
+   return expr(ir_unop_cos, a);
+}
+
+ir_expression *
+exp(operand a)
+{
+   return expr(ir_unop_exp, a);
+}
+
+ir_expression *
+rsq(operand a)
+{
+   return expr(ir_unop_rsq, a);
+}
+
+ir_expression *
+sqrt(operand a)
+{
+   return expr(ir_unop_sqrt, a);
+}
+
+ir_expression *
+log(operand a)
+{
+   return expr(ir_unop_log, a);
+}
+
+ir_expression *
+sign(operand a)
+{
+   return expr(ir_unop_sign, a);
+}
+
 ir_expression*
 equal(operand a, operand b)
 {
    return expr(ir_binop_equal, a, b);
 }
 
+ir_expression*
+nequal(operand a, operand b)
+{
+   return expr(ir_binop_nequal, a, b);
+}
+
 ir_expression*
 less(operand a, operand b)
 {
@@ -303,12 +417,24 @@ f2i(operand a)
    return expr(ir_unop_f2i, a);
 }
 
+ir_expression*
+bitcast_f2i(operand a)
+{
+   return expr(ir_unop_bitcast_f2i, a);
+}
+
 ir_expression*
 i2f(operand a)
 {
    return expr(ir_unop_i2f, a);
 }
 
+ir_expression*
+bitcast_i2f(operand a)
+{
+   return expr(ir_unop_bitcast_i2f, a);
+}
+
 ir_expression*
 i2u(operand a)
 {
@@ -327,12 +453,74 @@ f2u(operand a)
    return expr(ir_unop_f2u, a);
 }
 
+ir_expression*
+bitcast_f2u(operand a)
+{
+   return expr(ir_unop_bitcast_f2u, a);
+}
+
 ir_expression*
 u2f(operand a)
 {
    return expr(ir_unop_u2f, a);
 }
 
+ir_expression*
+bitcast_u2f(operand a)
+{
+   return expr(ir_unop_bitcast_u2f, a);
+}
+
+ir_expression*
+i2b(operand a)
+{
+   return expr(ir_unop_i2b, a);
+}
+
+ir_expression*
+b2i(operand a)
+{
+   return expr(ir_unop_b2i, a);
+}
+
+ir_expression *
+f2b(operand a)
+{
+   return expr(ir_unop_f2b, a);
+}
+
+ir_expression *
+b2f(operand a)
+{
+   return expr(ir_unop_b2f, a);
+}
+
+ir_expression *
+fma(operand a, operand b, operand c)
+{
+   return expr(ir_triop_fma, a, b, c);
+}
+
+ir_expression *
+lrp(operand x, operand y, operand a)
+{
+   return expr(ir_triop_lrp, x, y, a);
+}
+
+ir_expression *
+csel(operand a, operand b, operand c)
+{
+   return expr(ir_triop_csel, a, b, c);
+}
+
+ir_expression *
+bitfield_insert(operand a, operand b, operand c, operand d)
+{
+   void *mem_ctx = ralloc_parent(a.val);
+   return new(mem_ctx) ir_expression(ir_quadop_bitfield_insert,
+                                     a.val->type, a.val, b.val, c.val, d.val);
+}
+
 ir_if*
 if_tree(operand condition,
         ir_instruction *then_branch)