From c4150da8a61ec93e3c1c7e638d851bce6d46e699 Mon Sep 17 00:00:00 2001 From: James Stembridge Date: Thu, 1 May 2003 23:39:16 +0000 Subject: According to gatos (and as suspected) r100 colour keying is no different CVS patchset: 4739 CVS date: 2003/05/01 23:39:16 --- src/video_out/vidix/drivers/radeon_vid.c | 27 ++++++++++++--------------- 1 file 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)) -- cgit v1.2.3