projects / profile / ivi / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8bd70a7 85af4fd)
Merge branch 'r500-support'
authorDave Airlie <airlied@redhat.com>
Wed, 28 May 2008 00:20:14 +0000 (10:20 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 28 May 2008 00:20:14 +0000 (10:20 +1000)
commit261a15cf6389eba434d6857e78b524707803ed08
tree6b84a6a59fbe70f96e060f6b72a901010467556btree | snapshot
parent8bd70a7bbefe420dd696bfd6dc3b64d3dd17e884commit | diff
parent85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7commit | diff
Merge branch 'r500-support'

Bring in all the r500 3D code into master should be as stable as the r300
code it is landing on top off.

Conflicts:

src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/r300/r300_reg.h diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_state.c diff1 | diff2 | blob | history
Domain: Graphics System / GL;