git.libre-soc.org Git - mesa.git/commit

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 741744f 5b51b2e)

author	Jason Ekstrand <jason.ekstrand@intel.com>
	Fri, 5 Feb 2016 23:21:11 +0000 (15:21 -0800)
committer	Jason Ekstrand <jason.ekstrand@intel.com>
	Fri, 5 Feb 2016 23:21:11 +0000 (15:21 -0800)
commit	9401516113152ea2a571dc1103a2fa7ce68d4ee8
tree	2472a42bd85a3d3b9697be9235c029099c3d575d	tree
parent	741744f691d6ef63e9f9a4c03136f969f2ffb0bf	commit \| diff
parent	5b51b2e00013af70072106e9d34905326fc357fc	commit \| diff

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

15 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/compiler/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/.gitignore	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/ast_to_hir.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl_types.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl_types.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_opcodes.py	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_opt_algebraic.py	diff1 \|	diff2 \|	blob \| history
src/compiler/shader_enums.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_compiler.c	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/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/program/ir_to_mesa.cpp	diff1 \|	diff2 \|	blob \| history