Mesa (master): i965/fs: Change try_opt_frontfacing_ternary to eliminate asserts

[Ian Romanick]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sat Feb 28 08:26:37 2015 -0800

i965/fs: Change try_opt_frontfacing_ternary to eliminate asserts

If we check for the case that is actually necessary, the asserts
become superfluous.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 5d4b166..91dd212 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -2735,11 +2735,8 @@ fs_visitor::try_opt_frontfacing_ternary(ir_if *ir)
    if (!then_rhs || !else_rhs)
       return false;
 
-   if ((then_rhs->is_one() || then_rhs->is_negative_one()) &&
-       (else_rhs->is_one() || else_rhs->is_negative_one())) {
-      assert(then_rhs->is_one() == else_rhs->is_negative_one());
-      assert(else_rhs->is_one() == then_rhs->is_negative_one());
-
+   if ((then_rhs->is_one() && else_rhs->is_negative_one()) ||
+       (else_rhs->is_one() && then_rhs->is_negative_one())) {
       then_assign->lhs->accept(this);
       fs_reg dst = this->result;
       dst.type = BRW_REGISTER_TYPE_D;