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)
1  2 
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_fs.cpp

Simple merge