# HG changeset patch # User arpi # Date 1042136798 0 # Node ID b7d9b2c1fabab32a1c416a85a88b5cce683b8d8e # Parent 6787d02e45aabe8d81a3f85605cbcaf47cff1915 Fix radeon 7500 and 8500 15- and 16-bit colour key patch by James Stembridge diff -r 6787d02e45aa -r b7d9b2c1faba vidix/drivers/radeon_vid.c --- a/vidix/drivers/radeon_vid.c Thu Jan 09 18:25:54 2003 +0000 +++ b/vidix/drivers/radeon_vid.c Thu Jan 09 18:26:38 2003 +0000 @@ -1754,12 +1754,29 @@ switch(dbpp) { case 15: +#ifdef RADEON + if(RadeonFamily == 200) + 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)>>3) | ((radeon_grkey.ckey.green&0xF8)<<2) | ((radeon_grkey.ckey.red &0xF8)<<7); break; case 16: +#ifdef RADEON + /* This test may be too general/specific */ + if(RadeonFamily == 200) + 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)>>3) | ((radeon_grkey.ckey.green&0xFC)<<3)