Merge branch mesa-public/master into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 5 Feb 2016 22:21:13 +0000 (14:21 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 5 Feb 2016 22:21:13 +0000 (14:21 -0800)
commit9645b8eb1f1b79e537ad8ddb683507df7bc9da58
tree8e554a43a136b5f7951ff8734d42deb5e81c262b
parent3eebf3686be3de10cbeda8acd884e82df3e1438a
parent41875ac4edd8c884225c44c0840bd20291b410ca
Merge branch mesa-public/master into vulkan
src/glsl/glsl_parser_extras.cpp
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
src/mesa/main/mtypes.h