aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2015-02-10 21:36:26 -0800
committerMatt Turner <[email protected]>2015-02-11 10:26:49 -0800
commit09d6ea9ae3c487be20fb3157368003d30856d3bc (patch)
treedb3a97c53fa6878c164c2fbd26d5d049bdb1977c /src/mesa
parente68b67b53fce39a8c93188262d9e795ca50750ac (diff)
i965/fs: Remove conditional mod when optimizing a SEL into a MOV.
Missed in commit ca675b73, but got right in the companion commit 3c28b2c0.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f149ab5e6c1..c7c6accebf6 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2393,6 +2393,7 @@ fs_visitor::opt_algebraic()
if (inst->src[1].fixed_hw_reg.dw1.f >= 1.0f) {
inst->opcode = BRW_OPCODE_MOV;
inst->src[1] = reg_undef;
+ inst->conditional_mod = BRW_CONDITIONAL_NONE;
progress = true;
}
break;