Merge commit 'origin/tgsi-simplify-ext'
authorKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 14:31:14 +0000 (14:31 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 14:31:14 +0000 (14:31 +0000)
Conflicts:
src/gallium/drivers/r300/r300_vs.c

1  2 
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/tgsi/tgsi_sanity.c
src/gallium/auxiliary/tgsi/tgsi_ureg.c
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/nv50/nv50_program.c