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

This pulls in the separate texture/sampler stuff from upstream

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

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

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

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

diff --cc src/compiler/nir/nir_validate.c
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_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
Simple merge

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

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

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

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