Mercurial > mplayer.hg
comparison vidix/drivers/radeon_vid.c @ 8859:fd13e4c4f323
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>
| author | arpi |
|---|---|
| date | Thu, 09 Jan 2003 18:28:56 +0000 |
| parents | a6fc826a2b98 |
| children | 026ed72206ba |
comparison
equal
deleted
inserted
replaced
| 8858:a6fc826a2b98 | 8859:fd13e4c4f323 |
|---|---|
| 931 ati_card_ids[idx] == DEVICE_ATI_RADEON_VE_QZ || | 931 ati_card_ids[idx] == DEVICE_ATI_RADEON_VE_QZ || |
| 932 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M7|| | 932 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M7|| |
| 933 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M72|| | 933 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M72|| |
| 934 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M6|| | 934 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M6|| |
| 935 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M62) RadeonFamily = 100; | 935 ati_card_ids[idx] == DEVICE_ATI_RADEON_MOBILITY_M62) RadeonFamily = 100; |
| 936 if(ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QW || | |
| 937 ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QX) RadeonFamily = 150; | |
| 936 if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_BB || | 938 if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_BB || |
| 937 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH || | 939 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH || |
| 938 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI || | 940 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI || |
| 939 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QJ || | 941 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QJ || |
| 940 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK || | 942 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK || |
| 941 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QL || | 943 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QL || |
| 942 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH2 || | 944 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QH2 || |
| 943 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI2 || | 945 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QI2 || |
| 944 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QJ2 || | 946 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QJ2 || |
| 945 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK2 || | 947 ati_card_ids[idx] == DEVICE_ATI_RADEON_R200_QK2) RadeonFamily = 200; |
| 946 ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QW || | |
| 947 ati_card_ids[idx] == DEVICE_ATI_RADEON_RV200_QX) RadeonFamily = 200; | |
| 948 if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_ID || | 948 if(ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_ID || |
| 949 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IE || | 949 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IE || |
| 950 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IF || | 950 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IF || |
| 951 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IG || | 951 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_IG || |
| 952 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_LD || | 952 ati_card_ids[idx] == DEVICE_ATI_RADEON_R250_LD || |
| 1009 SAVED_OV0_VID_KEY_MSK = INREG(OV0_VID_KEY_MSK); | 1009 SAVED_OV0_VID_KEY_MSK = INREG(OV0_VID_KEY_MSK); |
| 1010 SAVED_OV0_KEY_CNTL = INREG(OV0_KEY_CNTL); | 1010 SAVED_OV0_KEY_CNTL = INREG(OV0_KEY_CNTL); |
| 1011 printf(RADEON_MSG" Saved overlay colorkey settings\n"); | 1011 printf(RADEON_MSG" Saved overlay colorkey settings\n"); |
| 1012 | 1012 |
| 1013 #ifdef RADEON | 1013 #ifdef RADEON |
| 1014 switch(RadeonFamily) | |
| 1015 { | |
| 1016 case 100: | |
| 1017 case 150: | |
| 1018 case 250: | |
| 1019 is_shift_required=1; | |
| 1020 break; | |
| 1021 default: | |
| 1022 break; | |
| 1023 } | |
| 1024 | |
| 1014 switch(def_cap.device_id) | 1025 switch(def_cap.device_id) |
| 1015 { | 1026 { |
| 1016 case DEVICE_ATI_RADEON_MOBILITY_M7: | 1027 case DEVICE_ATI_RADEON_MOBILITY_M7: |
| 1017 case DEVICE_ATI_RADEON_MOBILITY_M72: | 1028 case DEVICE_ATI_RADEON_MOBILITY_M72: |
| 1018 case DEVICE_ATI_RADEON_MOBILITY_M62: | 1029 case DEVICE_ATI_RADEON_MOBILITY_M62: |
| 1019 rage_ckey_model=1; | 1030 rage_ckey_model=1; |
| 1020 case DEVICE_ATI_RADEON_R250_IF: | |
| 1021 case DEVICE_ATI_RADEON_MOBILITY_M6: | |
| 1022 case DEVICE_ATI_RADEON_RV200_QW: | |
| 1023 case DEVICE_ATI_RADEON_RV200_QX: | |
| 1024 case DEVICE_ATI_RADEON_R100_QD: | |
| 1025 case DEVICE_ATI_RADEON_R100_QE: | |
| 1026 case DEVICE_ATI_RADEON_R100_QF: | |
| 1027 case DEVICE_ATI_RADEON_R100_QG: | |
| 1028 case DEVICE_ATI_RADEON_VE_QY: | |
| 1029 case DEVICE_ATI_RADEON_VE_QZ: | |
| 1030 is_shift_required=1; | |
| 1031 break; | |
| 1032 default: | 1031 default: |
| 1033 // printf(RADEON_MSG" Warning! Probably colorkeying isn't working correct!\n"); | 1032 // printf(RADEON_MSG" Warning! Probably colorkeying isn't working correct!\n"); |
| 1034 break; | 1033 break; |
| 1035 } | 1034 } |
| 1036 #endif | 1035 #endif |