Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 29 Dec 2015 21:47:37 +0000 (13:47 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Tue, 29 Dec 2015 21:53:41 +0000 (13:53 -0800)
commita33fcc0fd4c82a7ad2efc4051892acb40169308b
tree69836b7fce3339c5797bbdace0ff3ca0471547fe
parent5dd4386b92a665869b249eae07af78e648bd891d
parent0119773ffca586c9e51fa19248c3dfaab0500b25
Merge remote-tracking branch 'mesa-public/master' into vulkan

This pulls in nir_builder_init_simple_shader and allows us to delete
anv_nir_builder.h entirely.
21 files changed:
src/glsl/glsl_parser_extras.cpp
src/glsl/nir/nir.c
src/glsl/nir/nir_builder.h
src/glsl/nir/nir_intrinsics.h
src/glsl/nir/nir_opt_algebraic.py
src/glsl/nir/shader_enums.h
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/main/mtypes.h
src/mesa/program/prog_to_nir.c
src/vulkan/anv_meta.c
src/vulkan/anv_meta_clear.c