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

diff --cc configure.ac
Simple merge

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

diff --cc src/compiler/nir_types.cpp
Simple merge

diff --cc src/compiler/nir_types.h
Simple merge

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

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

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

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

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

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_surface_builder.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
Simple merge

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

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