Merge remote-tracking branch 'origin/master' into vulkan
authorJordan Justen <jordan.l.justen@intel.com>
Thu, 17 Mar 2016 08:38:05 +0000 (01:38 -0700)
committerJordan Justen <jordan.l.justen@intel.com>
Thu, 17 Mar 2016 08:44:07 +0000 (01:44 -0700)
commit3fd308a357b9057447d21c67718d13524dbbb40d
tree9f59a4b5c5fd2a2edefed9a51377221f6ddc3a20
parent5464f0c046ac68630355932639f18a02dc4b2d92
parent7d021cb15e6d67ecef8b020fd36c4a680bcc9c39
Merge remote-tracking branch 'origin/master' into vulkan
src/compiler/nir/nir.h
src/compiler/nir/nir_lower_io.c
src/intel/vulkan/anv_pipeline.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
src/mesa/drivers/dri/i965/brw_nir.c
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp