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

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4c5dccc 8b0fb1c)

author	Jason Ekstrand <jason.ekstrand@intel.com>
	Tue, 9 Feb 2016 23:30:39 +0000 (15:30 -0800)
committer	Jason Ekstrand <jason.ekstrand@intel.com>
	Tue, 9 Feb 2016 23:30:39 +0000 (15:30 -0800)
commit	768bd7f272e0dfd8cc17c49750fe8aaab78bb420
tree	5d8e07b6539565cbfe9ebff5d77cde8b6a8bf566	tree
parent	4c5dcccfba3c9d0e5c7302aa797ad8d31f18cf52	commit \| diff
parent	8b0fb1c152fe191768953aa8c77b89034a377f83	commit \| diff

Merge commit '8b0fb1c152fe191768953aa8c77b89034a377f83' into vulkan

This pulls in Rob Clark's const_index changes for NIR

18 files changed:

src/compiler/glsl/ast_to_hir.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/glsl_to_nir.cpp	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_builder.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_intrinsics.h	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_lower_atomics.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_lower_io.c	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_lower_vars_to_ssa.c	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/compiler/nir/spirv/vtn_variables.c	diff1 \|	\|	blob \| history
src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_nir.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_program.c	diff1 \|	diff2 \|	blob \| history
src/mesa/program/ir_to_mesa.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/program/prog_to_nir.c	diff1 \|	diff2 \|	blob \| history