Merge branch mesa-public/master into vulkan

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

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

diff --cc src/mesa/drivers/dri/i965/brw_device_info.c
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_vec4_tcs.cpp
Simple merge

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