Mesa (master): i965/fs: bail on move-to-flag in sel peephole

[Connor Abbott]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Thu Mar 19 20:58:58 2015 -0400

i965/fs: bail on move-to-flag in sel peephole

Fixes a piglit regression
(shaders/glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined) with
my series for GVN.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Connor Abbott <cwabbott0 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
index ee485fa..740ba67 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
@@ -176,7 +176,9 @@ fs_visitor::opt_peephole_sel()
          /* Check that the MOVs are the right form. */
          if (!then_mov[i]->dst.equals(else_mov[i]->dst) ||
              then_mov[i]->is_partial_write() ||
-             else_mov[i]->is_partial_write()) {
+             else_mov[i]->is_partial_write() ||
+             then_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE ||
+             else_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE) {
             movs = i;
             break;
          }