diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-05-28 10:20:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-05-28 10:20:14 +1000 |
| commit | 261a15cf6389eba434d6857e78b524707803ed08 (patch) | |
| tree | 6b84a6a59fbe70f96e060f6b72a901010467556b /src/mesa/drivers/dri/radeon/radeon_texstate.c | |
| parent | 8bd70a7bbefe420dd696bfd6dc3b64d3dd17e884 (diff) | |
| parent | 85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7 (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
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texstate.c')
0 files changed, 0 insertions, 0 deletions