Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 10 Feb 2016 00:47:37 +0000 (16:47 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 10 Feb 2016 00:47:37 +0000 (16:47 -0800)
commitb14f4c1fd33e13c48a8fd81a9bc77c6df60108dd
tree8b0682aa78f6c2170a76951a86d21762eadd15a1
parente01dd59b73d5787bc95ce0dfa8dfc95ba10a7581
parentd03e5d52557ce6523eb65dfec9172d6000f5ff8d
Merge remote-tracking branch 'mesa-public/master' into vulkan

This pulls in the separate texture/sampler stuff from upstream
17 files changed:
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.c
src/compiler/nir/nir.h
src/compiler/nir/nir_clone.c
src/compiler/nir/nir_print.c
src/compiler/nir/nir_remove_dead_variables.c
src/compiler/nir/nir_validate.c
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4.h
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp