Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 11 Feb 2016 01:10:19 +0000 (17:10 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 11 Feb 2016 01:12:11 +0000 (17:12 -0800)
commitf710f3ca377a4583b1fc5081cc28ee1d4aba71cb
treeab4d8226ab88b0e5ef2d9a4a6ebfdf79a244a6e2
parent7ef3e47c27fb9b11b113bb699019785960d6bf9a
parent8750299a420af76cebd3067f6f603eacde06ae06
Merge remote-tracking branch 'mesa-public/master' into vulkan

This also reverts commit 1d65abfa582a371558113f699ffbf16d60b64c90 because
now NIR handles texture offsets in a much more sane way.
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.h
src/compiler/nir/nir_clone.c
src/compiler/nir/nir_print.c
src/compiler/nir/spirv/spirv_to_nir.c
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_surface_formats.c
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp