From: Jason Ekstrand Date: Wed, 23 Mar 2016 21:30:29 +0000 (-0700) Subject: nir/algebraic: Fix fmin detection to match the spec X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed3a029e8088cb17af073c3b5f7444cb7e2f1cfb;p=mesa.git nir/algebraic: Fix fmin detection to match the spec The previous transformation got the arguments to fmin backwards. When NaNs are involved, the GLSL min/max aren't commutative so it matters. Reviewed-by: Francisco Jerez --- diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index ec6c6338bb1..7e3aa5aa798 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -122,7 +122,7 @@ optimizations = [ (('flt', 0.0, ('fabs', a)), ('fne', a, 0.0)), (('fge', ('fneg', ('fabs', a)), 0.0), ('feq', a, 0.0)), - (('bcsel', ('flt', a, b), a, b), ('fmin', a, b)), + (('bcsel', ('flt', b, a), b, a), ('fmin', a, b)), (('bcsel', ('flt', a, b), b, a), ('fmax', a, b)), (('bcsel', ('inot', 'a@bool'), b, c), ('bcsel', a, c, b)), (('bcsel', a, ('bcsel', a, b, c), d), ('bcsel', a, b, d)),