Set is_shift_required according to RadeonFamily

rather than device_id (thanks to Marcus Blomenkamp for this idea)

Also give RV200 a seperate family from R200 as they aren't really the same.

patch by James Stembridge <jstembridge@gmx.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8860 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-01-09 18:28:56 +00:00
parent f2d808751e
commit 88aee88ab5
1 changed files with 14 additions and 15 deletions

View File

@ -933,6 +933,8 @@ int vixProbe( int verbose,int force )
ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M72||
ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M6||
ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M62) RadeonFamily = 100;
if(ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QW ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QX) RadeonFamily = 150;
if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_BB ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI ||
@ -942,9 +944,7 @@ int vixProbe( int verbose,int force )
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH2 ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI2 ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QJ2 ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK2 ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QW ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QX) RadeonFamily = 200;
ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK2) RadeonFamily = 200;
if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_ID ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IE ||
ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IF ||
@ -1011,24 +1011,23 @@ int vixInit( void )
printf(RADEON_MSG" Saved overlay colorkey settings\n");
#ifdef RADEON
switch(RadeonFamily)
{
case 100:
case 150:
case 250:
is_shift_required=1;
break;
default:
break;
}
switch(def_cap.device_id)
{
case DEVICE_ATI_RADEON_MOBILITY_M7:
case DEVICE_ATI_RADEON_MOBILITY_M72:
case DEVICE_ATI_RADEON_MOBILITY_M62:
rage_ckey_model=1;
case DEVICE_ATI_RADEON_R250_IF:
case DEVICE_ATI_RADEON_MOBILITY_M6:
case DEVICE_ATI_RADEON_RV200_QW:
case DEVICE_ATI_RADEON_RV200_QX:
case DEVICE_ATI_RADEON_R100_QD:
case DEVICE_ATI_RADEON_R100_QE:
case DEVICE_ATI_RADEON_R100_QF:
case DEVICE_ATI_RADEON_R100_QG:
case DEVICE_ATI_RADEON_VE_QY:
case DEVICE_ATI_RADEON_VE_QZ:
is_shift_required=1;
break;
default:
// printf(RADEON_MSG" Warning! Probably colorkeying isn't working correct!\n");
break;