Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / i965 / brw_fs_vector_splitting.cpp

diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
index d4da86b3b06d2a32d9f29f7ba3a499f101b07c8c..2be6b08b5c7a26b0c7688e087e5b967f68cea2c0 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
@@ -212,7 +212,6 @@ public:
    struct variable_entry *get_splitting_entry(ir_variable *var);
 
    exec_list *variable_list;
-   void *mem_ctx;
 };
 
 struct variable_entry *
@@ -264,34 +263,43 @@ ir_vector_splitting_visitor::visit_leave(ir_assignment *ir)
    variable_entry *rhs = rhs_deref ? get_splitting_entry(rhs_deref->var) : NULL;
 
    if (lhs_deref && rhs_deref && (lhs || rhs) && !ir->condition) {
+      unsigned int rhs_chan = 0;
+
       /* Straight assignment of vector variables. */
-      for (unsigned int i = 0; i < ir->rhs->type->vector_elements; i++) {
+      for (unsigned int i = 0; i < ir->lhs->type->vector_elements; i++) {
         ir_dereference *new_lhs;
         ir_rvalue *new_rhs;
         void *mem_ctx = lhs ? lhs->mem_ctx : rhs->mem_ctx;
         unsigned int writemask;
 
+        if (!(ir->write_mask & (1 << i)))
+           continue;
+
         if (lhs) {
            new_lhs = new(mem_ctx) ir_dereference_variable(lhs->components[i]);
-           writemask = (ir->write_mask >> i) & 1;
+           writemask = 1;
         } else {
            new_lhs = ir->lhs->clone(mem_ctx, NULL);
-           writemask = ir->write_mask & (1 << i);
+           writemask = 1 << i;
         }
 
         if (rhs) {
-           new_rhs = new(mem_ctx) ir_dereference_variable(rhs->components[i]);
+           new_rhs =
+              new(mem_ctx) ir_dereference_variable(rhs->components[rhs_chan]);
         } else {
            new_rhs = new(mem_ctx) ir_swizzle(ir->rhs->clone(mem_ctx, NULL),
-                                             i, i, i, i, 1);
+                                             rhs_chan, 0, 0, 0, 1);
         }
 
         ir->insert_before(new(mem_ctx) ir_assignment(new_lhs,
                                                      new_rhs,
                                                      NULL, writemask));
+
+        rhs_chan++;
       }
       ir->remove();
    } else if (lhs) {
+      void *mem_ctx = lhs->mem_ctx;
       int elem = -1;
 
       switch (ir->write_mask) {
@@ -316,8 +324,6 @@ ir_vector_splitting_visitor::visit_leave(ir_assignment *ir)
       ir->write_mask = (1 << 0);
 
       handle_rvalue(&ir->rhs);
-      ir->rhs = new(mem_ctx) ir_swizzle(ir->rhs,
-                                       elem, elem, elem, elem, 1);
    } else {
       handle_rvalue(&ir->rhs);
    }
@@ -327,7 +333,6 @@ ir_vector_splitting_visitor::visit_leave(ir_assignment *ir)
    return visit_continue;
 }
 
-extern "C" {
 bool
 brw_do_vector_splitting(exec_list *instructions)
 {
@@ -385,4 +390,3 @@ brw_do_vector_splitting(exec_list *instructions)
 
    return true;
 }
-}