git.osdn.net Git - android-x86/external-mesa.git/commit

author	Jason Ekstrand <jason.ekstrand@intel.com>
	Wed, 26 Aug 2015 00:12:03 +0000 (17:12 -0700)
committer	Jason Ekstrand <jason.ekstrand@intel.com>
	Wed, 26 Aug 2015 01:41:21 +0000 (18:41 -0700)
commit	9b387b5d3f4103c51079ea5298d33086af6da433
tree	4127f2284b6b4a5746bbc01bbfc6a97305057cb4	tree \| snapshot
parent	5360edcb304e147341b934567f3bbf40e9d5a3b5	commit \| diff
parent	1d2a844e7d55645ea3d24fb589bec03695b3d2b1	commit \| diff

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

configure.ac	diff1 \|	diff2 \|	blob \| history
src/glsl/Makefile.sources	diff1 \|	diff2 \|	blob \| history
src/glsl/ast_to_hir.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser.yy	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/link_uniform_initializers.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/nir/glsl_to_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/nir/nir.h	diff1 \|	diff2 \|	blob \| history
src/glsl/nir/nir_intrinsics.h	diff1 \|	diff2 \|	blob \| history
src/glsl/nir/nir_lower_samplers.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/nir/nir_spirv.h	diff1 \|	\|	blob \| history
src/glsl/nir/spirv2nir.c	diff1 \|	\|	blob \| history
src/glsl/nir/spirv_to_nir.c	diff1 \|	\|	blob \| history
src/glsl/shader_enums.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_nir.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_shader.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_state_cache.c	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/drivers/dri/i965/intel_extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/intel_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/vulkan/anv_compiler.cpp	diff1 \|	\|	blob \| history