On Sat, Jul 4, 2015 at 2:40 PM, Neil Roberts <[email protected]> wrote: > In this bit of code point_five can be NULL if the expression is not a > constant. This fixes it to match the pattern of the rest of the chunk > of code so that it checks for NULLs. > > Cc: Matt Turner <[email protected]> > Cc: "10.6" <[email protected]> > --- > src/glsl/opt_algebraic.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp > index 9b8a426..c4b8715 100644 > --- a/src/glsl/opt_algebraic.cpp > +++ b/src/glsl/opt_algebraic.cpp > @@ -589,7 +589,7 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir) > continue; > > ir_constant *point_five = add_expr->operands[1 - > j]->as_constant(); > - if (!point_five->is_value(0.5, 0)) > + if (!point_five || !point_five->is_value(0.5, 0)) > continue; > > if (abs_expr->operands[0]->equals(sign_expr->operands[0])) { > -- > 1.9.3 >
Whoops. I think I thought that is_value NULL checked 'this'. Reviewed-by: Matt Turner <[email protected]> _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
