diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-06-09 09:35:09 +0200 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2011-06-09 09:35:09 +0200 |
| commit | 003401f95c9b59471c22368b7da16fe7a951e490 (patch) | |
| tree | d21fa0197ff27b8a38bd8b1d795b74d816db8b26 /src/gallium/drivers/r300/r300_screen.c | |
| parent | 00b4e48560f4d576b7b1924257322f5167e58c8d (diff) | |
| parent | d302804debeed13ced27fce222110c629e55d6f9 (diff) | |
| download | external_mesa3d-003401f95c9b59471c22368b7da16fe7a951e490.zip external_mesa3d-003401f95c9b59471c22368b7da16fe7a951e490.tar.gz external_mesa3d-003401f95c9b59471c22368b7da16fe7a951e490.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/r600/drm/r600_hw_context.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 240b841..05af214 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -49,20 +49,18 @@ static const char* r300_get_vendor(struct pipe_screen* pscreen) static const char* chip_families[] = { "ATI R300", "ATI R350", - "ATI R360", "ATI RV350", "ATI RV370", "ATI RV380", + "ATI RS400", + "ATI RC410", + "ATI RS480", "ATI R420", "ATI R423", "ATI R430", "ATI R480", "ATI R481", "ATI RV410", - "ATI RS400", - "ATI RC410", - "ATI RS480", - "ATI RS482", "ATI RS600", "ATI RS690", "ATI RS740", |