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)
1  2 
src/compiler/nir/nir_intrinsics.h
src/mesa/drivers/dri/i965/brw_surface_formats.c

Simple merge