Merge commit '85f5c18fef1ff2f19d698f150e23a02acd6f59b9' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 11 Feb 2016 00:49:41 +0000 (16:49 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 11 Feb 2016 01:09:56 +0000 (17:09 -0800)
commit7ef3e47c27fb9b11b113bb699019785960d6bf9a
tree3c67c175bed89db662b6bd0db9dbea3d0b6f529f
parentd2623a324713134b4da6e08775aed868300e96cb
parent85f5c18fef1ff2f19d698f150e23a02acd6f59b9
Merge commit '85f5c18fef1ff2f19d698f150e23a02acd6f59b9' into vulkan
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_nir.c
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
src/vulkan/anv_pipeline.c