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

diff --cc configure.ac
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/glsl_types.h
Simple merge

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

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

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

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

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

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

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

diff --cc src/mesa/drivers/dri/i965/brw_shader.h
index 2e47690d403bdde2d6cd5632067155a914e61f43,51b059fcaa1af92ec1f711fb5a3818e8ae58ef32..8899b30c1aefa7eef32fa9fcb803e77c527ae218
--- 1/src/mesa/drivers/dri/i965/brw_shader.h
--- 2/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@@ -233,6 -233,21 +233,18 @@@ bool opt_predicated_break(struct backen
  extern "C" {
  #endif
  
 -struct brw_compiler *
 -brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo);
 -
+ /**
+  * Scratch data used when compiling a GLSL geometry shader.
+  */
+ struct brw_gs_compile
+ {
+    struct brw_gs_prog_key key;
+    struct brw_vue_map input_vue_map;
+ 
+    unsigned control_data_bits_per_vertex;
+    unsigned control_data_header_size_bits;
+ };
+ 
  void
  brw_assign_common_binding_table_offsets(gl_shader_stage stage,
                                          const struct brw_device_info *devinfo,

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

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