[Mplayer-cvslog] CVS: main/vidix/drivers radeon_vid.c,1.44,1.45 radeon.h,1.6,1.7

[Nick Kurshev]

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

Modified Files:
	radeon_vid.c radeon.h 
Log Message:
Fixed color key definitions. Waiting for new bugreports ;)

Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- radeon_vid.c	11 Mar 2002 07:46:04 -0000	1.44
+++ radeon_vid.c	11 Mar 2002 08:48:54 -0000	1.45
@@ -659,7 +659,7 @@
   besr.ckey_on=0;
   besr.graphics_key_msk=0;
   besr.graphics_key_clr=0;
-  besr.ckey_cntl = GRAPHIC_KEY_FN_NE;
+  besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND;
 }
 
 
@@ -888,7 +888,7 @@
 		    VID_DEPTH_12BPP| VID_DEPTH_15BPP|
 		    VID_DEPTH_16BPP| VID_DEPTH_24BPP|
 		    VID_DEPTH_32BPP;
-	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK/* | VID_CAP_COLORKEY*/;
+	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 	return 0;
     }
     else  to->depth = to->flags = 0;
@@ -1483,16 +1483,17 @@
 		besr.graphics_key_msk=0;
 		besr.graphics_key_clr=0;
 	}
-	besr.graphics_key_msk = 0xFF000000|besr.graphics_key_clr;
-	besr.ckey_cntl = 0x20;
+	besr.graphics_key_msk = besr.graphics_key_clr;
+	besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_EQ|CMP_MIX_AND;
     }
     else
     {
 	besr.ckey_on=0;
 	besr.graphics_key_msk=0;
 	besr.graphics_key_clr=0;
-	besr.ckey_cntl = GRAPHIC_KEY_FN_NE;
+	besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND;
     }
+    radeon_fifo_wait(3);
     OUTREG(OV0_GRAPHICS_KEY_MSK, besr.graphics_key_msk);
     OUTREG(OV0_GRAPHICS_KEY_CLR, besr.graphics_key_clr);
     OUTREG(OV0_KEY_CNTL,besr.ckey_cntl);

Index: radeon.h
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- radeon.h	13 Feb 2002 08:55:05 -0000	1.6
+++ radeon.h	11 Mar 2002 08:48:54 -0000	1.7
@@ -686,16 +686,16 @@
 #define	OV0_GRAPHICS_KEY_CLR			0x04EC
 #define	OV0_GRAPHICS_KEY_MSK			0x04F0
 #define	OV0_KEY_CNTL				0x04F4
-#	define VIDEO_KEY_FN_MASK		0x00000007L
+#	define VIDEO_KEY_FN_MASK		0x00000003L
 #	define VIDEO_KEY_FN_FALSE		0x00000000L
 #	define VIDEO_KEY_FN_TRUE		0x00000001L
-#	define VIDEO_KEY_FN_EQ			0x00000004L
-#	define VIDEO_KEY_FN_NE			0x00000005L
-#	define GRAPHIC_KEY_FN_MASK		0x00000070L
+#	define VIDEO_KEY_FN_EQ			0x00000002L
+#	define VIDEO_KEY_FN_NE			0x00000003L
+#	define GRAPHIC_KEY_FN_MASK		0x00000030L
 #	define GRAPHIC_KEY_FN_FALSE		0x00000000L
 #	define GRAPHIC_KEY_FN_TRUE		0x00000010L
-#	define GRAPHIC_KEY_FN_EQ		0x00000040L
-#	define GRAPHIC_KEY_FN_NE		0x00000050L
+#	define GRAPHIC_KEY_FN_EQ		0x00000020L
+#	define GRAPHIC_KEY_FN_NE		0x00000030L
 #	define CMP_MIX_MASK			0x00000100L
 #	define CMP_MIX_OR			0x00000000L
 #	define CMP_MIX_AND			0x00000100L