1 files changed, 10 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
index 478614090a..4aac1b5a05 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -83,7 +83,6 @@ channel_expressions_predicate(ir_instruction *ir)
    return false;
 }
 
-extern "C" {
 GLboolean
 brw_do_channel_expressions(exec_list *instructions)
 {
@@ -99,7 +98,6 @@ brw_do_channel_expressions(exec_list *instructions)
 
    return v.progress;
 }
-}
 
 ir_rvalue *
 ir_channel_expressions_visitor::get_element(ir_variable *var, unsigned int elem)
@@ -119,7 +117,6 @@ ir_channel_expressions_visitor::assign(ir_assignment *ir, int elem, ir_rvalue *v
 {
    ir_dereference *lhs = ir->lhs->clone(mem_ctx, NULL);
    ir_assignment *assign;
-   ir_swizzle *val_swiz;
 
    /* This assign-of-expression should have been generated by the
     * expression flattening visitor (since we never short circit to
@@ -128,10 +125,7 @@ ir_channel_expressions_visitor::assign(ir_assignment *ir, int elem, ir_rvalue *v
     */
    assert(ir->write_mask == (1 << ir->lhs->type->components()) - 1);
 
-   /* Smear the float across all the channels for the masked write. */
-   val_swiz = new(mem_ctx) ir_swizzle(val, 0, 0, 0, 0,
-				      ir->lhs->type->components());
-   assign = new(mem_ctx) ir_assignment(lhs, val_swiz, NULL, (1 << elem));
+   assign = new(mem_ctx) ir_assignment(lhs, val, NULL, (1 << elem));
    ir->insert_before(assign);
 }
 
@@ -235,6 +229,12 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
    case ir_binop_bit_and:
    case ir_binop_bit_xor:
    case ir_binop_bit_or:
+   case ir_binop_less:
+   case ir_binop_greater:
+   case ir_binop_lequal:
+   case ir_binop_gequal:
+   case ir_binop_equal:
+   case ir_binop_nequal:
       for (i = 0; i < vector_elements; i++) {
 	 ir_rvalue *op0 = get_element(op_var[0], i);
 	 ir_rvalue *op1 = get_element(op_var[1], i);
@@ -315,10 +315,6 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
       break;
    }
 
-   case ir_binop_less:
-   case ir_binop_greater:
-   case ir_binop_lequal:
-   case ir_binop_gequal:
    case ir_binop_logic_and:
    case ir_binop_logic_xor:
    case ir_binop_logic_or:
@@ -326,8 +322,8 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
       printf("\n");
       assert(!"not reached: expression operates on scalars only");
       break;
-   case ir_binop_equal:
-   case ir_binop_nequal: {
+   case ir_binop_all_equal:
+   case ir_binop_any_nequal: {
       ir_expression *last = NULL;
       for (i = 0; i < vector_elements; i++) {
 	 ir_rvalue *op0 = get_element(op_var[0], i);
@@ -335,7 +331,7 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
 	 ir_expression *temp;
 	 ir_expression_operation join;
 
-	 if (expr->operation == ir_binop_equal)
+	 if (expr->operation == ir_binop_all_equal)
 	    join = ir_binop_logic_and;
 	 else
 	    join = ir_binop_logic_or;