Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 24 Jun 2015 01:05:25 +0000 (18:05 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 24 Jun 2015 01:05:25 +0000 (18:05 -0700)
commita62edcce4eb4c800d972817a20ee874bf2a2c3ef
tree46083a8762d45a6c595c7aaee2bb1cd0fc36eb62
parent9b9f973ca6d3cc1ec5be27857def00a83c032464
parent6844d6b7f8398a25eff511541b187afeb1199ce0
Merge remote-tracking branch 'mesa-public/master' into vulkan
31 files changed:
configure.ac
src/Makefile.am
src/glsl/Makefile.am
src/glsl/ast_to_hir.cpp
src/glsl/glsl_parser_extras.cpp
src/glsl/glsl_types.cpp
src/glsl/glsl_types.h
src/glsl/ir.h
src/glsl/link_uniform_initializers.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir_lower_io.c
src/glsl/nir/nir_lower_samplers.cpp
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/Makefile.am
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_cs.cpp
src/mesa/drivers/dri/i965/brw_defines.h
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/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/intel_debug.c
src/mesa/drivers/dri/i965/intel_extensions.c
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/main/mtypes.h
src/mesa/program/ir_to_mesa.cpp
src/vulkan/compiler.cpp