Merge commit 'origin/st-shader-varients'

Conflicts:
	src/mesa/state_tracker/st_atom_shader.c
	src/mesa/state_tracker/st_program.c

diff --cc src/mesa/state_tracker/st_atom.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_bitmap.c
Simple merge

diff --cc src/mesa/state_tracker/st_draw.c
Simple merge

diff --cc src/mesa/state_tracker/st_program.c
Simple merge