Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 11 Dec 2015 22:29:13 +0000 (14:29 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 11 Dec 2015 22:29:13 +0000 (14:29 -0800)
commit1c605c8dfa5552617f7b2764b859ca9decc0244e
tree8183f9f981e99faa3311c3ab35d3b5421c8ffae5
parentd12ea21dd5ea5bf00b7aecd98ec1f10f79f26c3a
parentb8425bb1e845bef19dac8d8a9fd672e958018802
Merge remote-tracking branch 'mesa-public/master' into vulkan

This pulls in a shared local memory fix.
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp