Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 3 Oct 2015 18:32:29 +0000 (11:32 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 3 Oct 2015 18:32:29 +0000 (11:32 -0700)
commit09ba0a7c05a2240d905b8568e5bc30e06ccbdb3e
treecd513062546bf8ebd84c179cf248373e5252aba3
parentef56cf7738ecb25e8c668c509097fc714ca71c96
parent3cd5395206398847d554ddf4cad49192042bd8ef
Merge remote-tracking branch 'mesa-public/master' into vulkan
src/glsl/nir/nir.h
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_nir.c
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/vulkan/anv_compiler.cpp