Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Oct 2008 14:19:05 +0000 (15:19 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Oct 2008 14:23:36 +0000 (15:23 +0100)
commitd7f1cb5b5a134b63227d5746a2dd1f05597c5c2f
tree7446e243da8b50f6cb323b7917bdb94fbd528368
parent7ac1fc77661faf0897507fef0437fe69d0ba53ac
parentf7556fdd40ed2719beaba271eee4a7551e212ad1
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
14 files changed:
progs/trivial/Makefile
src/gallium/auxiliary/draw/draw_private.h
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/mfeatures.h
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/program.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c