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)
1  2 
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

Simple merge
Simple merge
Simple merge