Choose the r600 driver for r600+ chipsets, not r300.

This should stop the annoying errors for gl on r{6,7}00 chipsets.
Support for GL on these cards is coming soon.
This commit is contained in:
oga 2011-05-02 21:48:06 +00:00
parent 4aab434bf2
commit 00c5cd661c
2 changed files with 5 additions and 3 deletions

View File

@ -1538,10 +1538,11 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
info->dri->pDRIInfo = pDRIInfo;
pDRIInfo->drmDriverName = RADEON_DRIVER_NAME;
if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) {
if ( (info->ChipFamily >= CHIP_FAMILY_R600) )
pDRIInfo->clientDriverName = R600_DRIVER_NAME;
else if ( (info->ChipFamily >= CHIP_FAMILY_R300) )
pDRIInfo->clientDriverName = R300_DRIVER_NAME;
} else
if ( info->ChipFamily >= CHIP_FAMILY_R200 )
else if ( info->ChipFamily >= CHIP_FAMILY_R200 )
pDRIInfo->clientDriverName = R200_DRIVER_NAME;
else
pDRIInfo->clientDriverName = RADEON_DRIVER_NAME;

View File

@ -38,6 +38,7 @@
#define RADEON_DRIVER_NAME "radeon"
#define R200_DRIVER_NAME "r200"
#define R300_DRIVER_NAME "r300"
#define R600_DRIVER_NAME "r600"
#define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR
#define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR