Merge ../mesa into vulkan
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 11 Dec 2015 21:09:06 +0000 (13:09 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 11 Dec 2015 21:09:06 +0000 (13:09 -0800)
commit21d5e52da862af7e6f4509ae70667b12d2280b47
tree85cf39a299a117bc2212596be4dbd2463011b41f
parent6ae4e59faca7875322a9a8a64e9d7b4a5a87ed48
parentc51f133197437d01696abd9513fbcda4b16b897c
Merge ../mesa into vulkan
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_fs.cpp