Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 14 Apr 2016 03:25:39 +0000 (20:25 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 14 Apr 2016 03:25:39 +0000 (20:25 -0700)
commit12f88ba32a14ea79134f4e995a55149f078a2f27
tree9070861dced23d0ad7dbec598bfd96b686eb7bf1
parent79fbec30fc16399ede9385ef52cb62cefbb388f4
parent171a570f388b2895d14f6d5418c99573cffd6369
Merge remote-tracking branch 'public/master' into vulkan
14 files changed:
configure.ac
src/compiler/Makefile.nir.am
src/compiler/Makefile.sources
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.h
src/compiler/nir/nir_lower_io.c
src/compiler/nir/nir_opt_algebraic.py
src/compiler/nir/nir_print.c
src/compiler/nir/spirv/spirv_to_nir.c
src/intel/vulkan/anv_pipeline.c
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/main/mtypes.h