Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 26 Aug 2015 00:12:03 +0000 (17:12 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 26 Aug 2015 01:41:21 +0000 (18:41 -0700)
commit9b387b5d3f4103c51079ea5298d33086af6da433
tree4127f2284b6b4a5746bbc01bbfc6a97305057cb4
parent5360edcb304e147341b934567f3bbf40e9d5a3b5
parent1d2a844e7d55645ea3d24fb589bec03695b3d2b1
Merge remote-tracking branch 'mesa-public/master' into vulkan
26 files changed:
configure.ac
src/glsl/Makefile.sources
src/glsl/ast_to_hir.cpp
src/glsl/glsl_parser.yy
src/glsl/glsl_parser_extras.cpp
src/glsl/link_uniform_initializers.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.h
src/glsl/nir/nir_intrinsics.h
src/glsl/nir/nir_lower_samplers.cpp
src/glsl/nir/nir_spirv.h
src/glsl/nir/spirv2nir.c
src/glsl/nir/spirv_to_nir.c
src/glsl/shader_enums.h
src/mesa/drivers/dri/i965/brw_context.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_shader.cpp
src/mesa/drivers/dri/i965/brw_state_cache.c
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/drivers/dri/i965/intel_extensions.c
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/main/mtypes.h
src/vulkan/anv_compiler.cpp