Merge ../mesa into vulkan
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Thu, 8 Oct 2015 19:25:34 +0000 (12:25 -0700)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 9 Oct 2015 00:20:24 +0000 (17:20 -0700)
commitfc2a66cfcddea34af0e93dd2221ae1fd3fdd9e87
tree3aa60e04c953b6f25e019cfef00aecb9c11bc4fa
parent48a87f4ba062e572a66f546997366d8896a4ecd1
parentc71f0d45e6d0081ea814fb0b16baec4e75a07bcb
Merge ../mesa into vulkan
19 files changed:
src/glsl/Makefile.sources
src/glsl/ast_to_hir.cpp
src/glsl/glsl_parser_extras.cpp
src/glsl/glsl_types.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.c
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_fs.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/program/ir_to_mesa.cpp
src/vulkan/Makefile.am
src/vulkan/anv_compiler.cpp