commit 613e6e4d5df91ae498d6f64fe40e247e6bcc762d
author Matt Turner <mattst88@gmail.com> Thu Mar 23 12:12:18 2017 -0700
committer Andres Gomez <agomez@igalia.com> Wed Mar 29 19:13:18 2017 +0300
tree 686a280176620fc94ba0594aaccd531f525fce9e
parent 8c5dfa91693f28f5ee464961145a4347aa8ca15a

i965/fs: Don't emit SEL instructions for type-converting MOVs.

SEL can only convert between a few integer types, which we basically
never do.

Fixes fs/vs-double-uniform-array-direct-indirect-non-uniform-control-flow
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Acked-by: Francisco Jerez <currojerez@riseup.net>

(cherry picked from commit 7dccd38b400d3a65da20ddefe282a7bb0b7ccb58)

src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp

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 8cd897f..4c1c160 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
@@ -165,6 +165,8 @@
              then_mov[i]->exec_size != else_mov[i]->exec_size ||
              then_mov[i]->group != else_mov[i]->group ||
              then_mov[i]->force_writemask_all != else_mov[i]->force_writemask_all ||
+             then_mov[i]->dst.type != then_mov[i]->src[0].type ||
+             else_mov[i]->dst.type != else_mov[i]->src[0].type ||
              then_mov[i]->is_partial_write() ||
              else_mov[i]->is_partial_write() ||
              then_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE ||