Merge branch 'wip/i965-separate-sampler-tex' into vulkan

diff --cc src/glsl/nir/nir.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_vec4_nir.cpp
Simple merge

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