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

diff --cc configure.ac
Simple merge

diff --cc src/compiler/Makefile.sources
Simple merge

diff --cc src/compiler/glsl/glsl_parser_extras.cpp
Simple merge

diff --cc src/compiler/nir/Makefile.sources
Simple merge

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

diff --cc src/compiler/nir/nir.c
Simple merge

diff --cc src/compiler/nir/nir.h
index 0f8c781,34f31eb..ae37cbf
--- 1/src/compiler/nir/nir.h
--- 2/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@@ -2094,9 -1994,8 +2094,9 @@@ void nir_index_blocks(nir_function_imp
  void nir_print_shader(nir_shader *shader, FILE *fp);
  void nir_print_instr(const nir_instr *instr, FILE *fp);
  
- nir_shader *nir_shader_clone(void *mem_ctx, const nir_shader *s);
- nir_function_impl *nir_function_impl_clone(const nir_function_impl *impl);
+ nir_shader * nir_shader_clone(void *mem_ctx, const nir_shader *s);
+ nir_function_impl *nir_function_impl_clone(const nir_function_impl *fi);
 +nir_constant *nir_constant_clone(const nir_constant *c, nir_variable *var);
  
  #ifdef DEBUG
  void nir_validate_shader(nir_shader *shader);

diff --cc src/compiler/nir/nir_opt_algebraic.py
Simple merge

diff --cc src/compiler/nir/nir_print.c
Simple merge

diff --cc src/compiler/nir/nir_validate.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/Makefile.sources
Simple merge

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

diff --cc src/mesa/drivers/dri/i965/brw_device_info.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs.cpp
index 0f9de30,86d2bd9..b5f1a87
--- 1/src/mesa/drivers/dri/i965/brw_fs.cpp
--- 2/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@@ -1931,10 -1933,15 +1931,10 @@@ fs_visitor::compact_virtual_grfs(
  void
  fs_visitor::assign_constant_locations()
  {
-    /* Only the first compile (SIMD8 mode) gets to decide on locations. */
-    if (dispatch_width != 8)
+    /* Only the first compile gets to decide on locations. */
+    if (dispatch_width != min_dispatch_width)
        return;
  
 -   unsigned int num_pull_constants = 0;
 -
 -   pull_constant_loc = ralloc_array(mem_ctx, int, uniforms);
 -   memset(pull_constant_loc, -1, sizeof(pull_constant_loc[0]) * uniforms);
 -
     bool is_live[uniforms];
     memset(is_live, 0, sizeof(is_live));
  

diff --cc src/mesa/drivers/dri/i965/brw_fs.h
Simple merge

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

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

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

diff --cc src/mesa/drivers/dri/i965/brw_vec4.h
index 7b86e1b,d43a5a8..6143f65
--- 1/src/mesa/drivers/dri/i965/brw_vec4.h
--- 2/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@@ -274,15 -276,10 +274,8 @@@ public
     void emit_shader_time_end();
     void emit_shader_time_write(int shader_time_subindex, src_reg value);
  
-    void emit_untyped_atomic(unsigned atomic_op, unsigned surf_index,
-                             dst_reg dst, src_reg offset, src_reg src0,
-                             src_reg src1);
- 
-    void emit_untyped_surface_read(unsigned surf_index, dst_reg dst,
-                                   src_reg offset);
- 
     src_reg get_scratch_offset(bblock_t *block, vec4_instruction *inst,
                              src_reg *reladdr, int reg_offset);
 -   src_reg get_pull_constant_offset(bblock_t *block, vec4_instruction *inst,
 -                                  src_reg *reladdr, int reg_offset);
     void emit_scratch_read(bblock_t *block, vec4_instruction *inst,
                          dst_reg dst,
                          src_reg orig_src,

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

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

diff --cc src/mesa/main/mtypes.h
Simple merge