Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 15 Mar 2016 21:09:50 +0000 (14:09 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Tue, 15 Mar 2016 21:09:50 +0000 (14:09 -0700)
commit7f6a0cb29c89a03441be744680a2145445be3a3c
tree516824ab49962521563b95fa79430cf948baaccc
parentb83785d86d2c7f07323920615c72a9f09695a9a7
parente103b52aec773537d2821d8acc42ac9caa2a4b17
Merge remote-tracking branch 'public/master' into vulkan
22 files changed:
configure.ac
src/compiler/Makefile.sources
src/compiler/glsl/glsl_parser_extras.cpp
src/compiler/nir/Makefile.sources
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.c
src/compiler/nir/nir.h
src/compiler/nir/nir_opt_algebraic.py
src/compiler/nir/nir_print.c
src/compiler/nir/nir_validate.c
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/drivers/dri/i965/brw_device_info.h
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_visitor.cpp
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4.h
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h