Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 7 Apr 2016 23:56:34 +0000 (16:56 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 7 Apr 2016 23:56:34 +0000 (16:56 -0700)
commite26a978773ba8fbff04cd2ab3342fcb02e90c06e
tree303f7d5e47f2b11ad2edf7ed0f82e90620646df9
parent15895bf777bd5f68a197506fdeaced28aa440622
parent1cd19ebc4a892ada69f9085892441c00674b2764
Merge remote-tracking branch 'public/master' into vulkan
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/main/mtypes.h