diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-01 23:39:16 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-01 23:39:16 +0000 |
| commit | c4150da8a61ec93e3c1c7e638d851bce6d46e699 (patch) | |
| tree | a6b2c86a31ed91470891b5022a64f848ac3694a5 | |
| parent | 8f841a3dd9888a0bef37a9118e667a7489a8179d (diff) | |
| download | xine-lib-c4150da8a61ec93e3c1c7e638d851bce6d46e699.tar.gz xine-lib-c4150da8a61ec93e3c1c7e638d851bce6d46e699.tar.bz2 | |
According to gatos (and as suspected) r100 colour keying is no different
CVS patchset: 4739
CVS date: 2003/05/01 23:39:16
| -rw-r--r-- | src/video_out/vidix/drivers/radeon_vid.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c index deae77422..7807863d9 100644 --- a/src/video_out/vidix/drivers/radeon_vid.c +++ b/src/video_out/vidix/drivers/radeon_vid.c @@ -3208,33 +3208,30 @@ static void set_gr_key( void ) { case 15: #ifndef RAGE128 - if(RadeonFamily > 100) - besr.graphics_key_clr= - ((radeon_grkey.ckey.blue &0xF8)) - | ((radeon_grkey.ckey.green&0xF8)<<8) - | ((radeon_grkey.ckey.red &0xF8)<<16); - else -#endif + besr.graphics_key_clr= + ((radeon_grkey.ckey.blue &0xF8)) + | ((radeon_grkey.ckey.green&0xF8)<<8) + | ((radeon_grkey.ckey.red &0xF8)<<16); +#else besr.graphics_key_clr= ((radeon_grkey.ckey.blue &0xF8)>>3) | ((radeon_grkey.ckey.green&0xF8)<<2) | ((radeon_grkey.ckey.red &0xF8)<<7); break; +#endif case 16: #ifndef RAGE128 - /* This test may be too general/specific */ - if(RadeonFamily > 100) - besr.graphics_key_clr= - ((radeon_grkey.ckey.blue &0xF8)) - | ((radeon_grkey.ckey.green&0xFC)<<8) - | ((radeon_grkey.ckey.red &0xF8)<<16); - else -#endif + besr.graphics_key_clr= + ((radeon_grkey.ckey.blue &0xF8)) + | ((radeon_grkey.ckey.green&0xFC)<<8) + | ((radeon_grkey.ckey.red &0xF8)<<16); +#else besr.graphics_key_clr= ((radeon_grkey.ckey.blue &0xF8)>>3) | ((radeon_grkey.ckey.green&0xFC)<<3) | ((radeon_grkey.ckey.red &0xF8)<<8); break; +#endif case 24: besr.graphics_key_clr= ((radeon_grkey.ckey.blue &0xFF)) |