Merge remote-tracking branch 'mesa-public/master' into vulkan

This fixes the bitfieldextract and bitfieldinsert CTS tests

diff --cc src/glsl/Makefile.am
Simple merge

diff --cc src/glsl/ast_to_hir.cpp
Simple merge

diff --cc src/glsl/nir/glsl_to_nir.cpp
Simple merge

diff --cc src/glsl/nir/nir.h
Simple merge

diff --cc src/glsl/nir/nir_opcodes.py
Simple merge

diff --cc src/glsl/nir/nir_opt_algebraic.py
index 4169046,7745b76..1e80ba7
--- 1/src/glsl/nir/nir_opt_algebraic.py
--- 2/src/glsl/nir/nir_opt_algebraic.py
+++ b/src/glsl/nir/nir_opt_algebraic.py
@@@ -226,10 -225,23 +226,24 @@@ 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'),
 +   (('frem', a, b), ('fsub', a, ('fmul', b, ('ftrunc', ('fdiv', a, b)))), 'options->lower_fmod'),
     (('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'),
+ 
+    (('bitfield_insert', 'base', 'insert', 'offset', 'bits'),
+     ('bcsel', ('ilt', 31, 'bits'), 'insert',
+               ('bfi', ('bfm', 'bits', 'offset'), 'insert', 'base')),
+     'options->lower_bitfield_insert'),
+ 
+    (('ibitfield_extract', 'value', 'offset', 'bits'),
+     ('bcsel', ('ilt', 31, 'bits'), 'value',
+               ('ibfe', 'value', 'offset', 'bits')),
+     'options->lower_bitfield_extract'),
+ 
+    (('ubitfield_extract', 'value', 'offset', 'bits'),
+     ('bcsel', ('ult', 31, 'bits'), 'value',
+               ('ubfe', 'value', 'offset', 'bits')),
+     'options->lower_bitfield_extract'),
  ]
  
  # Add optimizations to handle the case where the result of a ternary is

diff --cc src/mesa/drivers/dri/i965/brw_fs_generator.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs_nir.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_shader.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_surface_formats.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
Simple merge

diff --cc src/mesa/program/ir_to_mesa.cpp
Simple merge