git.libre-soc.org Git - mesa.git/commit - src/mesa/shader/slang/descrip.mms

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 00b463f 420ff89)

author	Roland Scheidegger <sroland@vmware.com>
	Tue, 22 Dec 2009 19:54:26 +0000 (20:54 +0100)
committer	Roland Scheidegger <sroland@vmware.com>
	Tue, 22 Dec 2009 19:54:26 +0000 (20:54 +0100)
commit	35e8283c69d80debb44b05ea79dc5f67303a7432
tree	aacfe7f201094793c3d29ec0ddcc71cb01f7476c	tree
parent	00b463fc30b30911797c5d5eaaeae79b7a36589b	commit \| diff
parent	420ff89067515a74c9625a103cadc267d5f64bd4	commit \| diff

Merge branch 'gallium-edgeflags'

Conflicts:
src/mesa/state_tracker/st_draw.c

12 files changed:

src/gallium/auxiliary/tgsi/tgsi_dump.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/tgsi/tgsi_scan.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/tgsi/tgsi_scan.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv30/nv30_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_state_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_vs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_shader_tokens.h	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_program.c	diff1 \|	diff2 \|	blob \| history