Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 25 Mar 2016 00:30:14 +0000 (17:30 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 25 Mar 2016 00:30:14 +0000 (17:30 -0700)
commit2c3f95d6aaab38cd66dd3dee1b089d5c91928eea
tree43423daf0da9c45f4054c5763a87f33dbfc7c4d5
parenta5dc3c0f02aa523d1d3d123b62b9a187821079fe
parent22b343a8ec75a08dae6a6badbb261eab8437475d
Merge remote-tracking branch 'public/master' into vulkan
29 files changed:
configure.ac
src/compiler/Makefile.sources
src/compiler/glsl/Makefile.sources
src/compiler/glsl/glsl_parser_extras.cpp
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.h
src/compiler/nir/nir_builder.h
src/compiler/nir/nir_lower_io.c
src/compiler/nir/nir_lower_system_values.c
src/compiler/nir/nir_opcodes.py
src/compiler/nir/nir_opt_algebraic.py
src/compiler/nir/nir_print.c
src/compiler/nir/spirv/spirv_to_nir.c
src/compiler/nir/spirv/vtn_glsl450.c
src/compiler/nir/spirv/vtn_variables.c
src/compiler/nir_types.h
src/intel/vulkan/anv_meta_blit.c
src/intel/vulkan/anv_meta_blit2d.c
src/intel/vulkan/anv_meta_resolve.c
src/intel/vulkan/anv_nir_apply_dynamic_offsets.c
src/intel/vulkan/anv_nir_apply_pipeline_layout.c
src/mesa/drivers/dri/i965/brw_compiler.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_nir.c
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