[Mplayer-cvslog] CVS: main/vidix/drivers radeon_vid.c,1.61,1.62

[Arpi of Ize]

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mail:/var/tmp.root/cvs-serv12002/vidix/drivers

Modified Files:
	radeon_vid.c 
Log Message:
Fix radeon 7500 and 8500 15- and 16-bit colour key
patch by James Stembridge <jstembridge at gmx.net>


Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- radeon_vid.c	9 Jan 2003 18:25:54 -0000	1.61
+++ radeon_vid.c	9 Jan 2003 18:26:38 -0000	1.62
@@ -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)