Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 19 Oct 2015 18:15:32 +0000 (11:15 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 19 Oct 2015 21:14:21 +0000 (14:14 -0700)
commit958fc04dc51a2561c8598f42df59e3d9139e56a7
treeb6acf05aa073e97ae8e58647bf05c2c3e816f041
parent995d9c4ac7fb046e01196cec308ebe10002a28da
parentde862f03accb12b044ced60cb98f47a055457223
Merge remote-tracking branch 'mesa-public/master' into vulkan
27 files changed:
configure.ac
src/Makefile.am
src/glsl/Makefile.am
src/glsl/Makefile.sources
src/glsl/ast_to_hir.cpp
src/glsl/link_uniform_initializers.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/glsl_types.cpp
src/glsl/nir/glsl_types.h
src/glsl/nir/nir.h
src/glsl/nir/nir_intrinsics.h
src/glsl/nir/nir_types.cpp
src/glsl/nir/nir_types.h
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/Makefile.sources
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_program.c
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h
src/mesa/program/ir_to_mesa.cpp
src/vulkan/Makefile.am
src/vulkan/anv_compiler.cpp
src/vulkan/anv_meta.c
src/vulkan/anv_nir_builder.h