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

diff --cc configure.ac
Simple merge

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

diff --cc src/compiler/glsl/.gitignore
Simple merge

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

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

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

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

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

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

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

diff --cc src/mesa/drivers/dri/i965/brw_compiler.c
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/main/mtypes.h
Simple merge

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