Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 01:30:52 +0000 (18:30 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 01:30:52 +0000 (18:30 -0700)
commit76fa7b16f474253356d3bf59adc91769dc51f184
treec56b9ef93489818ceb280106471446c76af7c8ec
parent547032c56ab032f51781b8fb5808e911a18cc87e
parenteeff13315858fcb09eefba9a94e6bae5820572e0
Merge remote-tracking branch 'public/master' into vulkan
src/compiler/nir/nir_intrinsics.h
src/mesa/drivers/dri/i965/brw_surface_formats.c