projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7df20f0 56fc298)
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)
Merge master again to get the brw_device_info with the
correct slice counts for KBL.

1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_device_info.c patch | diff1 | diff2 | blob | history
src/mesa/main/mtypes.h patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/mesa/main/mtypes.h
Simple merge