Merge branch 'wip/i965-separate-sampler-tex' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 14 Nov 2015 16:23:27 +0000 (08:23 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 14 Nov 2015 16:23:27 +0000 (08:23 -0800)
commitb5d4027c356f177f82c9ec52c138e7f85f3dbe95
tree565f1e6cdfe425f55c30778ec5969596ba7f6219
parent1469ccb7464836c752fa2664c36d8fae7e80606c
parentc7d504ad937b084a345fd6252784435d451ab03e
Merge branch 'wip/i965-separate-sampler-tex' into vulkan
src/glsl/nir/nir.h
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp