git.libre-soc.org Git - mesa.git/commit - src/compiler/glsl/glcpp/glcpp-parse.y

author	Jason Ekstrand <jason.ekstrand@intel.com>
	Tue, 15 Mar 2016 21:09:50 +0000 (14:09 -0700)
committer	Jason Ekstrand <jason.ekstrand@intel.com>
	Tue, 15 Mar 2016 21:09:50 +0000 (14:09 -0700)
commit	7f6a0cb29c89a03441be744680a2145445be3a3c
tree	516824ab49962521563b95fa79430cf948baaccc	tree
parent	b83785d86d2c7f07323920615c72a9f09695a9a7	commit \| diff
parent	e103b52aec773537d2821d8acc42ac9caa2a4b17	commit \| diff

Merge remote-tracking branch 'public/master' into vulkan

22 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/compiler/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/glsl_to_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_opt_algebraic.py	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_print.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_validate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_device_info.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_device_info.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history

configure.ac	diff1 \|	diff2 \|	blob \| history
src/compiler/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/glsl_to_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_opt_algebraic.py	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_print.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_validate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_device_info.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_device_info.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history