Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 22 Oct 2015 00:40:13 +0000 (17:40 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 22 Oct 2015 00:40:13 +0000 (17:40 -0700)
commitfed60e3c73c7be7c1e2194054daf29381d0ddc18
tree42b63a2ba88ee7b173047d9917197636b2ea9e0f
parent0ab926dfbf56ad6482b875d980ae95c533b765f9
parent48c76eae8e52fba2fe22d2cfa7f3c94a5420feb2
Merge remote-tracking branch 'mesa-public/master' into vulkan
14 files changed:
configure.ac
src/glsl/ast_to_hir.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/glsl_types.h
src/glsl/nir/nir.h
src/mesa/drivers/dri/i965/brw_compiler.h
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_program.c
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_shader.h
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h