Merge ../mesa into vulkan
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 9 Jan 2016 06:16:43 +0000 (22:16 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 9 Jan 2016 06:16:43 +0000 (22:16 -0800)
commitf0993f81c7fab4ceb99b010d8ee2facbf4fdc737
tree2da8aeaa95a0337d9177f4d808837f7c5cbdbc25
parentcfdc955fd5e1e965c458e50f4dc877653a463684
parentda5d4583e53fc9cdc86aba7d2ac770e01baa158d
Merge ../mesa into vulkan
18 files changed:
configure.ac
src/glsl/Makefile.am
src/glsl/Makefile.sources
src/glsl/ast_to_hir.cpp
src/glsl/glsl_parser_extras.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.h
src/glsl/nir/nir_opt_algebraic.py
src/glsl/nir/shader_enums.c
src/glsl/nir/shader_enums.h
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
src/mesa/main/mtypes.h