Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 31 Aug 2015 23:30:07 +0000 (16:30 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 31 Aug 2015 23:30:07 +0000 (16:30 -0700)
commit0af4bf4d4bc96d1a8471bdfe8055fa05e7ccd0fe
tree35866ec07082277237c3120b252d0a489a8e60ec
parent9f9628e9dd64b2bae62269cc4ebb0f920a5833c5
parent76f17266ec68c644b2609d355018329636ae8e75
Merge remote-tracking branch 'mesa-public/master' into vulkan
12 files changed:
src/glsl/glsl_parser_extras.cpp
src/glsl/glsl_types.h
src/glsl/nir/nir.h
src/glsl/nir/nir_builder.h
src/glsl/nir/spirv_to_nir.c
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_nir.c
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/intel_debug.c
src/mesa/main/mtypes.h