Merge remote branch 'main/master' into radeon-rewrite
authorDave Airlie <airlied@redhat.com>
Fri, 20 Mar 2009 00:52:17 +0000 (10:52 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 20 Mar 2009 00:52:17 +0000 (10:52 +1000)
commit407e8ae5b167b0193e1e5b1266a5d61ed836dfb5
tree2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d
parentbdaa0341caffc353fd26bbd91865c2d86eed11c1
parent114bb54324f22cb53bcd14607234d0acd74d37bd
Merge remote branch 'main/master' into radeon-rewrite

Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
15 files changed:
configs/autoconf.in
configure.ac
src/mesa/drivers/dri/r200/r200_pixel.c
src/mesa/drivers/dri/r200/r200_texstate.c
src/mesa/drivers/dri/r200/r200_vertprog.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_program_pair.c
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_texstate.c
src/mesa/drivers/dri/radeon/server/radeon_reg.h