diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-05-26 11:44:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-29 15:41:53 -0700 |
| commit | b814afeb6cbfd9c24d1634b54657d42242c14d5b (patch) | |
| tree | 5f9247ce7fb40bb64dddfa6d68dac996652a6c36 | |
| parent | 17c7ead727ea63cc7e30865b923d8da7909a963b (diff) | |
Revert "i965/fs: Give up in interference check if we see a WHILE."
This reverts commit 55de1c035cbca2b7087b3aa21a8c3dfc900a4ad9.
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit fc025a67198941ea105cb8a22272b4abf38b8616)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 b2ab386ab66..020d992b15a 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) || |