Merge branch 'mesa_7_7_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Thu, 14 Jan 2010 22:31:04 +0000 (22:31 +0000)
committerJakob Bornecrantz <jakob@vmware.com>
Thu, 14 Jan 2010 22:31:04 +0000 (22:31 +0000)
commitb01ffb12ed82dcf435b186e2aff35e344a8a6ebe
treea62ee3f8f402f0c34ac88b5011da41a9cab8c6e3
parentffd28480560caecfb676a4bbe85a85672271e3f7
parent252812bf15c3479d921157b9a432c7e42d3b9446
Merge branch 'mesa_7_7_branch'

Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
20 files changed:
progs/demos/engine.c
progs/demos/fire.c
progs/demos/isosurf.c
progs/demos/morph3d.c
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/drivers/r300/r300_flush.c
src/gallium/drivers/svga/svga_state_fs.c
src/gallium/drivers/svga/svga_state_vs.c
src/gallium/state_trackers/dri/dri_drawable.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_texture.c
src/mesa/swrast/s_accum.c
src/mesa/swrast/s_bitmap.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_drawpix.c
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_pipeline.c
src/mesa/tnl/t_vb_program.c