OSDN Git Service

Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 3 Nov 2015 23:45:04 +0000 (15:45 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Tue, 3 Nov 2015 23:45:04 +0000 (15:45 -0800)
commitb00e3f221b3f6dd0e87697c53331fd033b6e8676
treea59dfeca8fd404c65da59a663e0abda301e893a2
parenta1e7b8701a4687f29b013364a852aa773c80f960
parent5d4b019d2a6d4deb4db11780618515cf1fa8a4fc
Merge remote-tracking branch 'mesa-public/master' into vulkan
21 files changed:
configure.ac
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_intrinsics.h
src/glsl/nir/nir_opt_algebraic.py
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_compiler.h
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_device_info.c
src/mesa/drivers/dri/i965/brw_device_info.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_shader.cpp
src/mesa/drivers/dri/i965/brw_shader.h
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h
src/vulkan/anv_device.c