From: Matt Turner Date: Mon, 26 May 2014 18:44:53 +0000 (-0700) Subject: Revert "i965/fs: Give up in interference check if we see a WHILE." X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc025a67198941ea105cb8a22272b4abf38b8616;p=mesa.git Revert "i965/fs: Give up in interference check if we see a WHILE." This reverts commit 55de1c035cbca2b7087b3aa21a8c3dfc900a4ad9. Cc: "10.2" --- 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) ||