diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
| commit | f0993f81c7fab4ceb99b010d8ee2facbf4fdc737 (patch) | |
| tree | 2da8aeaa95a0337d9177f4d808837f7c5cbdbc25 /src/glsl/nir/nir_opt_algebraic.py | |
| parent | cfdc955fd5e1e965c458e50f4dc877653a463684 (diff) | |
| parent | da5d4583e53fc9cdc86aba7d2ac770e01baa158d (diff) | |
Merge ../mesa into vulkan
Diffstat (limited to 'src/glsl/nir/nir_opt_algebraic.py')
| -rw-r--r-- | src/glsl/nir/nir_opt_algebraic.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glsl/nir/nir_opt_algebraic.py b/src/glsl/nir/nir_opt_algebraic.py index f4a863239b6..db18fc9619b 100644 --- a/src/glsl/nir/nir_opt_algebraic.py +++ b/src/glsl/nir/nir_opt_algebraic.py @@ -184,6 +184,7 @@ optimizations = [ (('fmul', ('fexp2', a), ('fexp2', b)), ('fexp2', ('fadd', a, b))), # Division and reciprocal (('fdiv', 1.0, a), ('frcp', a)), + (('fdiv', a, b), ('fmul', a, ('frcp', b)), 'options->lower_fdiv'), (('frcp', ('frcp', a)), a), (('frcp', ('fsqrt', a)), ('frsq', a)), (('fsqrt', a), ('frcp', ('frsq', a)), 'options->lower_fsqrt'), @@ -226,8 +227,8 @@ optimizations = [ # Misc. lowering (('fmod', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod'), (('bitfield_insert', a, b, c, d), ('bfi', ('bfm', d, c), b, a), 'options->lower_bitfield_insert'), - (('uadd_carry', a, b), ('ult', ('iadd', a, b), a), 'options->lower_uadd_carry'), - (('usub_borrow', a, b), ('ult', a, b), 'options->lower_usub_borrow'), + (('uadd_carry', a, b), ('b2i', ('ult', ('iadd', a, b), a)), 'options->lower_uadd_carry'), + (('usub_borrow', a, b), ('b2i', ('ult', a, b)), 'options->lower_usub_borrow'), ] # Add optimizations to handle the case where the result of a ternary is |