diff options
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_common_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 65 |
1 files changed, 12 insertions, 53 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 87f4776ccf5..bb0168e6cd9 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -53,54 +53,18 @@ int RADEON_DEBUG = (0); static const char* get_chip_family_name(int chip_family) { switch(chip_family) { +#if defined(RADEON_R100) case CHIP_FAMILY_R100: return "R100"; case CHIP_FAMILY_RV100: return "RV100"; case CHIP_FAMILY_RS100: return "RS100"; case CHIP_FAMILY_RV200: return "RV200"; case CHIP_FAMILY_RS200: return "RS200"; +#elif defined(RADEON_R200) case CHIP_FAMILY_R200: return "R200"; case CHIP_FAMILY_RV250: return "RV250"; case CHIP_FAMILY_RS300: return "RS300"; case CHIP_FAMILY_RV280: return "RV280"; - case CHIP_FAMILY_R300: return "R300"; - case CHIP_FAMILY_R350: return "R350"; - case CHIP_FAMILY_RV350: return "RV350"; - case CHIP_FAMILY_RV380: return "RV380"; - case CHIP_FAMILY_R420: return "R420"; - case CHIP_FAMILY_RV410: return "RV410"; - case CHIP_FAMILY_RS400: return "RS400"; - case CHIP_FAMILY_RS600: return "RS600"; - case CHIP_FAMILY_RS690: return "RS690"; - case CHIP_FAMILY_RS740: return "RS740"; - case CHIP_FAMILY_RV515: return "RV515"; - case CHIP_FAMILY_R520: return "R520"; - case CHIP_FAMILY_RV530: return "RV530"; - case CHIP_FAMILY_R580: return "R580"; - case CHIP_FAMILY_RV560: return "RV560"; - case CHIP_FAMILY_RV570: return "RV570"; - case CHIP_FAMILY_R600: return "R600"; - case CHIP_FAMILY_RV610: return "RV610"; - case CHIP_FAMILY_RV630: return "RV630"; - case CHIP_FAMILY_RV670: return "RV670"; - case CHIP_FAMILY_RV620: return "RV620"; - case CHIP_FAMILY_RV635: return "RV635"; - case CHIP_FAMILY_RS780: return "RS780"; - case CHIP_FAMILY_RS880: return "RS880"; - case CHIP_FAMILY_RV770: return "RV770"; - case CHIP_FAMILY_RV730: return "RV730"; - case CHIP_FAMILY_RV710: return "RV710"; - case CHIP_FAMILY_RV740: return "RV740"; - case CHIP_FAMILY_CEDAR: return "CEDAR"; - case CHIP_FAMILY_REDWOOD: return "REDWOOD"; - case CHIP_FAMILY_JUNIPER: return "JUNIPER"; - case CHIP_FAMILY_CYPRESS: return "CYPRESS"; - case CHIP_FAMILY_HEMLOCK: return "HEMLOCK"; - case CHIP_FAMILY_PALM: return "PALM"; - case CHIP_FAMILY_SUMO: return "SUMO"; - case CHIP_FAMILY_SUMO2: return "SUMO2"; - case CHIP_FAMILY_BARTS: return "BARTS"; - case CHIP_FAMILY_TURKS: return "TURKS"; - case CHIP_FAMILY_CAICOS: return "CAICOS"; +#endif default: return "unknown"; } } @@ -122,16 +86,14 @@ static const GLubyte *radeonGetString(struct gl_context * ctx, GLenum name) unsigned offset; GLuint agp_mode = (radeon->radeonScreen->card_type==RADEON_CARD_PCI) ? 0 : radeon->radeonScreen->AGPMode; - const char* chipclass; char hardwarename[32]; - if (IS_R200_CLASS(radeon->radeonScreen)) - chipclass = "R200"; - else - chipclass = "R100"; - sprintf(hardwarename, "%s (%s %04X)", - chipclass, +#if defined(RADEON_R100) + "R100", +#elif defined(RADEON_R200) + "R200", +#endif get_chip_family_name(radeon->radeonScreen->chip_family), radeon->radeonScreen->device_id); @@ -220,12 +182,9 @@ GLboolean radeonInitContext(radeonContextPtr radeon, radeon->texture_depth = ( glVisual->rgbBits > 16 ) ? DRI_CONF_TEXTURE_DEPTH_32 : DRI_CONF_TEXTURE_DEPTH_16; - if (IS_R200_CLASS(radeon->radeonScreen) || - IS_R100_CLASS(radeon->radeonScreen)) { - radeon->texture_row_align = 32; - radeon->texture_rect_row_align = 64; - radeon->texture_compressed_row_align = 32; - } + radeon->texture_row_align = 32; + radeon->texture_rect_row_align = 64; + radeon->texture_compressed_row_align = 32; radeon_init_dma(radeon); @@ -251,7 +210,7 @@ static void radeon_destroy_atom_list(radeonContextPtr radeon) /** * Cleanup common context fields. - * Called by r200DestroyContext/r300DestroyContext + * Called by r200DestroyContext */ void radeonDestroyContext(__DRIcontext *driContextPriv ) { |