Mesa (master): Revert "i965/fs: Give up in interference check if we see a WHILE."

[Matt Turner]

Module: Mesa
Branch: master
Commit: fc025a67198941ea105cb8a22272b4abf38b8616
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc025a67198941ea105cb8a22272b4abf38b8616

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon May 26 11:44:53 2014 -0700

Revert "i965/fs: Give up in interference check if we see a WHILE."

This reverts commit 55de1c035cbca2b7087b3aa21a8c3dfc900a4ad9.

Cc: "10.2" <mesa-stable at lists.freedesktop.org>

---

 src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
index b2ab386..020d992 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -102,7 +102,7 @@ can_coalesce_vars(brw::fs_live_variables *live_intervals,
    for (scan_inst = (fs_inst *)inst->next;
         !scan_inst->is_tail_sentinel() && ip <= live_intervals->end[var_to];
         scan_inst = (fs_inst *)scan_inst->next, ip++) {
-      if (scan_inst->opcode == BRW_OPCODE_WHILE)
+      if (scan_inst->is_control_flow())
          return false;
 
       if (scan_inst->dst.equals(inst->dst) ||