glsl: Add unary ir_expression constructor

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 308b7c2010dc97fffec95cb9690e260a2a797e76..1f5e2ebdcb732572a886c677172ade0c67cd9c06 100644 (file)
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -191,9 +191,22 @@ ir_assignment::ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs,
 }
 
 
+ir_expression::ir_expression(int op, const struct glsl_type *type,
+                            ir_rvalue *op0)
+{
+   assert(get_num_operands(ir_expression_operation(op)) == 1);
+   this->ir_type = ir_type_expression;
+   this->type = type;
+   this->operation = ir_expression_operation(op);
+   this->operands[0] = op0;
+   this->operands[1] = NULL;
+}
+
 ir_expression::ir_expression(int op, const struct glsl_type *type,
                             ir_rvalue *op0, ir_rvalue *op1)
 {
+   assert((op1 == NULL) && (get_num_operands(ir_expression_operation(op)) == 1)
+         || (get_num_operands(ir_expression_operation(op)) == 2));
    this->ir_type = ir_type_expression;
    this->type = type;
    this->operation = ir_expression_operation(op);

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 960cd8bab433a45378fe99ced85848bc1778e408..99fdaa3b09b918b81d0f9b4ba452d57892a3df8a 100644 (file)
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -832,6 +832,14 @@ enum ir_expression_operation {
 
 class ir_expression : public ir_rvalue {
 public:
+   /**
+    * Constructor for unary operation expressions
+    */
+   ir_expression(int op, const struct glsl_type *type, ir_rvalue *);
+
+   /**
+    * Constructor for binary operation expressions
+    */
    ir_expression(int op, const struct glsl_type *type,
                 ir_rvalue *, ir_rvalue *);