glsl: When lowering non-constant array indexing, respect existing conditions

If the non-constant index was in the LHS of an assignment, any
existing condititon on that assignment would be lost.

Fixes i965 piglit:

    fs-temp-array-mat[234]-col-row-wr
    fs-temp-array-mat[234]-index-col-row-wr
    fs-temp-array-mat[234]-index-col-wr
    fs-temp-array-mat[234]-index-row-wr
    vs-varying-array-mat[234]-index-col-wr

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/glsl/lower_variable_index_to_cond_assign.cpp
index 107bcc67aed865c9a68fd79b7747167adb7aa38a..e08ec13456bf8fdb087c752c9a13561d652a103e 100644 (file)
--- a/src/glsl/lower_variable_index_to_cond_assign.cpp
+++ b/src/glsl/lower_variable_index_to_cond_assign.cpp
@@ -417,9 +417,24 @@ public:
 
       switch_generator sg(ag, index, 4, 4);
 
-      exec_list list;
-      sg.generate(0, length, &list);
-      base_ir->insert_before(&list);
+      /* If the original assignment has a condition, respect that original
+       * condition!  This is acomplished by wrapping the new conditional
+       * assignments in an if-statement that uses the original condition.
+       */
+      if ((orig_assign != NULL) && (orig_assign->condition != NULL)) {
+        /* No need to clone the condition because the IR that it hangs on is
+         * going to be removed from the instruction sequence.
+         */
+        ir_if *if_stmt = new(mem_ctx) ir_if(orig_assign->condition);
+
+        sg.generate(0, length, &if_stmt->then_instructions);
+        base_ir->insert_before(if_stmt);
+      } else {
+        exec_list list;
+
+        sg.generate(0, length, &list);
+        base_ir->insert_before(&list);
+      }
 
       return var;
    }