Merge remote branch 'origin/master' into radeon-rewrite
authorDave Airlie <airlied@redhat.com>
Thu, 9 Apr 2009 00:14:35 +0000 (10:14 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 9 Apr 2009 00:31:08 +0000 (10:31 +1000)
commitd1a9b1f513109c975a5a7ed5a2d0c329b280afe4
tree5c85af47b4f5af0661acf129e3ce3f59e43cbfd9
parent90ffce497395d8c02fee2ea4ee4c025eede3d876
parent8648c2685870174cf620ef15de70ef030a8d5a20
Merge remote branch 'origin/master' into radeon-rewrite

Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
configure.ac
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
src/mesa/drivers/dri/radeon/radeon_tex.c