diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-09-30 09:17:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-30 09:17:20 +1000 |
| commit | 4378c17c88c6d1fb046f53ef83955fd7fbd992db (patch) | |
| tree | 1feef7a82b09dbb43df76f9e96fcc84fc9d7e03e | |
| parent | dbcd6526021c50770c3e5e04b04dc64c70298124 (diff) | |
r600g: return string for chip family
use same strings as r600c.
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index cf3d58e506..a25674b183 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -225,17 +225,36 @@ static const char* r600_get_vendor(struct pipe_screen* pscreen) return "X.Org"; } +static const char *r600_get_family_name(enum radeon_family family) +{ + switch(family) { + case CHIP_R600: return "R600"; + case CHIP_RV610: return "RV610"; + case CHIP_RV630: return "RV630"; + case CHIP_RV670: return "RV670"; + case CHIP_RV620: return "RV620"; + case CHIP_RV635: return "RV635"; + case CHIP_RS780: return "RS780"; + case CHIP_RS880: return "RS880"; + case CHIP_RV770: return "RV770"; + case CHIP_RV730: return "RV730"; + case CHIP_RV710: return "RV710"; + case CHIP_RV740: return "RV740"; + case CHIP_CEDAR: return "CEDAR"; + case CHIP_REDWOOD: return "REDWOOD"; + case CHIP_JUNIPER: return "JUNIPER"; + case CHIP_CYPRESS: return "CYPRESS"; + case CHIP_HEMLOCK: return "HEMLOCK"; + default: return "unknown"; + } +} + static const char* r600_get_name(struct pipe_screen* pscreen) { struct r600_screen *rscreen = (struct r600_screen *)pscreen; enum radeon_family family = r600_get_family(rscreen->radeon); - if (family >= CHIP_R600 && family < CHIP_RV770) - return "R600 (HD2XXX,HD3XXX)"; - else if (family < CHIP_CEDAR) - return "R700 (HD4XXX)"; - else - return "EVERGREEN"; + return r600_get_family_name(family); } static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) |