Merge remote-tracking branch 'origin/master' into vulkan
authorKenneth Graunke <kenneth@whitecape.org>
Wed, 2 Mar 2016 00:26:09 +0000 (16:26 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Wed, 2 Mar 2016 01:11:29 +0000 (17:11 -0800)
commit89e421369c54a8edc4930352e062f03b5c66b886
tree54ec1f2d99454da125abe0ed49164b1c47fd9d36
parente941fd84707d4ed04a683f8862d184956a60f9ad
parent1be953797ea4ae31193ab40bd35133eef38ae0ce
Merge remote-tracking branch 'origin/master' into vulkan
src/compiler/glsl/glsl_parser_extras.cpp
src/intel/vulkan/anv_pipeline.c
src/mesa/drivers/dri/i965/brw_compiler.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
src/mesa/drivers/dri/i965/brw_nir.c
src/mesa/drivers/dri/i965/brw_nir.h
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
src/mesa/main/mtypes.h