Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 1 Apr 2016 21:59:38 +0000 (14:59 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 1 Apr 2016 22:16:21 +0000 (15:16 -0700)
commit95106f6bfbbb87b702e4bbba98e2eaea71924cd9
tree9650d284ec7f7417b2bcf8a906dfa43dfc547cf7
parentcf2257069cbde19fd177a02c079206914aac5d14
parent14c46954c910efb1db94a068a866c7259deaa9d9
Merge remote-tracking branch 'public/master' into vulkan
13 files changed:
src/compiler/Makefile.sources
src/compiler/glsl/glsl_parser_extras.cpp
src/compiler/glsl/standalone_scaffolding.cpp
src/compiler/nir/Makefile.sources
src/compiler/nir/glsl_to_nir.cpp
src/compiler/nir/nir.h
src/compiler/nir/nir_opt_algebraic.py
src/compiler/shader_enums.h
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/main/mtypes.h