Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 28 Dec 2015 18:56:31 +0000 (10:56 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 28 Dec 2015 18:56:31 +0000 (10:56 -0800)
commitd5fa51bdee51ed4c24c28dd51be669a04b67e640
tree173104b12c13658aa4a086866cbddadf71907246
parentd9dcfafacc41660f3b7ce5062dec47985af51c65
parent237f2f2d8b45d9d956102eec6f9be63193e5269b
Merge remote-tracking branch 'mesa-public/master' into vulkan

This pulls in the removal of nir_function_overload
20 files changed:
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.c
src/glsl/nir/nir.h
src/glsl/nir/nir_builder.h
src/glsl/nir/nir_clone.c
src/glsl/nir/nir_inline_functions.c
src/glsl/nir/nir_lower_io.c
src/glsl/nir/nir_lower_returns.c
src/glsl/nir/nir_lower_samplers.c
src/glsl/nir/nir_lower_system_values.c
src/glsl/nir/nir_print.c
src/glsl/nir/spirv_to_nir.c
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/program/prog_to_nir.c
src/vulkan/anv_nir_apply_dynamic_offsets.c
src/vulkan/anv_nir_apply_pipeline_layout.c
src/vulkan/anv_nir_builder.h
src/vulkan/anv_nir_lower_push_constants.c
src/vulkan/anv_pipeline.c