Merge ../mesa into vulkan
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Tue, 12 Jan 2016 18:54:26 +0000 (10:54 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Tue, 12 Jan 2016 18:54:26 +0000 (10:54 -0800)
commitaf422fe9b36e98397d914be9eabae937634bef31
treebae52236907092b6b3f6a7e0c63e341ddd6b88d5
parent7df20f0c1456738aa598ba8d4ce88679765ca13e
parent56fc2986d554b93d16fa1151765a9987bc42e4da
Merge ../mesa into vulkan

Merge master again to get the brw_device_info with the
correct slice counts for KBL.
configure.ac
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/main/mtypes.h