diff options
| author | Connor Abbott <cwabbott0@gmail.com> | 2015-03-19 20:58:58 -0400 |
|---|---|---|
| committer | Connor Abbott <cwabbott0@gmail.com> | 2015-03-20 11:53:11 -0400 |
| commit | ccb9cbc849af50c435ec69498281cd3cef52d02e (patch) | |
| tree | 89ff2bb4dd5fddbc61aab7223d9707d7083c8a23 /src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp | |
| parent | 1cc00f1875e7b830db27945090ad78be41157dc9 (diff) | |
| download | external_mesa3d-ccb9cbc849af50c435ec69498281cd3cef52d02e.zip external_mesa3d-ccb9cbc849af50c435ec69498281cd3cef52d02e.tar.gz external_mesa3d-ccb9cbc849af50c435ec69498281cd3cef52d02e.tar.bz2 | |
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@gmail.com>
Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |