Merge branch 'master' into glsl-pp-rework-2

Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h

diff --cc Makefile
Simple merge

diff --cc SConstruct
Simple merge

diff --cc configs/default
Simple merge

diff --cc src/gallium/winsys/gdi/SConscript
Simple merge

diff --cc src/mesa/Makefile
Simple merge

diff --cc src/mesa/SConscript
Simple merge

diff --cc src/mesa/shader/slang/slang_compile.c
Simple merge

diff --cc src/mesa/sources.mak
Simple merge