From: Tapani Pälli Date: Tue, 7 Jan 2014 08:25:40 +0000 (+0200) Subject: i965/fs: do SEL optimization only when src type for MOV matches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0978a6966abb886539158934d11ae7f170786be2;p=mesa.git i965/fs: do SEL optimization only when src type for MOV matches Fixes a bug where then branch operates with ivec4 while else uses vec4. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72379 Signed-off-by: Tapani Pälli Reviewed-by: Matt Turner --- 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 d3147998028..db0be1911cc 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp @@ -169,6 +169,12 @@ fs_visitor::opt_peephole_sel() break; } + /* Check that source types for mov operations match. */ + if (then_mov[i]->src[0].type != else_mov[i]->src[0].type) { + movs = i; + break; + } + if (!then_mov[i]->src[0].equals(else_mov[i]->src[0])) { /* Only the last source register can be a constant, so if the MOV * in the "then" clause uses a constant, we need to put it in a