Merge commit 'origin/gallium-0.1' into gallium-0.1
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 15 Feb 2008 11:15:47 +0000 (11:15 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 15 Feb 2008 11:15:47 +0000 (11:15 +0000)
commit6ac2c1cc0cd1253ba2014d459010032127f185ec
tree6348de9de19e7394800a983c8c614566d22b870b
parentc04a7f8929d674971a472ffa4d3a31200c22aa5a
parent6d3831b11d9f5aaba61cc2fb8ade61437ad7c335
Merge commit 'origin/gallium-0.1' into gallium-0.1

Conflicts:

src/gallium/drivers/softpipe/sp_quad_fs.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/softpipe/sp_state_fs.c
14 files changed:
src/gallium/aux/draw/draw_vertex_shader.c
src/gallium/aux/tgsi/exec/tgsi_exec.c
src/gallium/aux/tgsi/exec/tgsi_exec.h
src/gallium/aux/tgsi/exec/tgsi_sse2.c
src/gallium/drivers/softpipe/Makefile
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/softpipe/sp_fs.h
src/gallium/drivers/softpipe/sp_fs_exec.c
src/gallium/drivers/softpipe/sp_fs_llvm.c
src/gallium/drivers/softpipe/sp_fs_sse.c
src/gallium/drivers/softpipe/sp_quad_fs.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/softpipe/sp_state_fs.c
src/gallium/include/pipe/p_state.h