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)
commit87eec80c1120d2cd9749ee360b77922feabf7f10
treee60d852329b2d8b981dcc1928a6f8d1a2254e120
parent06d3732a9094030fc33120f16f162e0d405f132c
parent5285de7c0fc067dc036a5b421140a696ce2cabbf
Merge commit 'origin/tgsi-simplify-ext'

Conflicts:
src/gallium/drivers/r300/r300_vs.c
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