Merge remote-tracking branch 'origin/master' into vulkan
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Wed, 24 Feb 2016 20:50:27 +0000 (12:50 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Wed, 24 Feb 2016 21:04:54 +0000 (13:04 -0800)
commit59f57289959702e528b68bdd0d06488089517a00
treea266656ac6129f5ad14b9d0d0c69c7077466c3f3
parent25c2470b24ce8411f6747eb887137b2511b6d529
parentc95d5c5f6fbfe4a96276e67ed279562b33432fb5
Merge remote-tracking branch 'origin/master' into vulkan
16 files changed:
configure.ac
src/compiler/glsl/glsl_parser_extras.cpp
src/compiler/nir_types.cpp
src/compiler/nir_types.h
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs.h
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4.h
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h