[Mesa-dev] [PATCH 16/22] glsl: Eliminate ir_builder assign overloads that have a condition

[Ian Romanick]

From: "\"Ian Romanick\"" <idr at freedesktop.org>

From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/compiler/glsl/ir_builder.cpp | 16 ++--------------
 src/compiler/glsl/ir_builder.h   |  2 --
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/compiler/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp
index 8d61533..fd9881b 100644
--- a/src/compiler/glsl/ir_builder.cpp
+++ b/src/compiler/glsl/ir_builder.cpp
@@ -46,13 +46,13 @@ ir_factory::make_temp(const glsl_type *type, const char *name)
 }
 
 ir_assignment *
-assign(deref lhs, operand rhs, operand condition, int writemask)
+assign(deref lhs, operand rhs, int writemask)
 {
    void *mem_ctx = ralloc_parent(lhs.val);
 
    ir_assignment *assign = new(mem_ctx) ir_assignment(lhs.val,
                                                       rhs.val,
-                                                      condition.val,
+                                                      NULL,
                                                       writemask);
 
    return assign;
@@ -64,18 +64,6 @@ 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)
 {
diff --git a/src/compiler/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h
index ff1ff70..94de1ee 100644
--- a/src/compiler/glsl/ir_builder.h
+++ b/src/compiler/glsl/ir_builder.h
@@ -122,8 +122,6 @@ public:
 
 ir_assignment *assign(deref lhs, operand rhs);
 ir_assignment *assign(deref lhs, operand rhs, int writemask);
-ir_assignment *assign(deref lhs, operand rhs, operand condition);
-ir_assignment *assign(deref lhs, operand rhs, operand condition, int writemask);
 
 ir_return *ret(operand retval);
 
-- 
2.9.5