Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 4 Apr 2016 20:58:05 +0000 (13:58 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 4 Apr 2016 20:58:05 +0000 (13:58 -0700)
commit6a049687841d87fc5bbd0fb0a192f03776f67630
treeddb5d24f705b0451b948906df697082b9f47d0a3
parentfe247bbe922ab862914bc76c10557157a06700ac
parent88ef2476dcdd61000cbae7ded9c8fa52927429d8
Merge remote-tracking branch 'public/master' into vulkan
src/mesa/drivers/dri/i965/brw_compiler.c
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_surface_formats.c
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/main/mtypes.h