[Mplayer-cvslog] CVS: main/vidix/drivers mach64.h,1.1,1.2 mach64_vid.c,1.14,1.15

[Michael Niedermayer]

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

Modified Files:
	mach64.h mach64_vid.c 
Log Message:
OVERLAY_KEY_CNTL values


Index: mach64.h
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mach64.h	13 Feb 2002 08:59:23 -0000	1.1
+++ mach64.h	25 Feb 2002 16:16:44 -0000	1.2
@@ -1559,6 +1559,19 @@
 #define OVERLAY_GRAPHICS_KEY_CLR BlockIOTag(0x104u)
 #define OVERLAY_GRAPHICS_KEY_MSK BlockIOTag(0x105u)
 #define OVERLAY_KEY_CNTL	BlockIOTag(0x106u)
+#	define VIDEO_KEY_FN_MASK		0x00000007L
+#	define VIDEO_KEY_FN_FALSE		0x00000000L
+#	define VIDEO_KEY_FN_TRUE		0x00000001L
+#	define VIDEO_KEY_FN_NE			0x00000004L
+#	define VIDEO_KEY_FN_EQ			0x00000005L // EQ and NE are exchanged relative to radeon
+#	define GRAPHIC_KEY_FN_MASK		0x00000070L
+#	define GRAPHIC_KEY_FN_FALSE		0x00000000L
+#	define GRAPHIC_KEY_FN_TRUE		0x00000010L
+#	define GRAPHIC_KEY_FN_NE		0x00000040L
+#	define GRAPHIC_KEY_FN_EQ		0x00000050L // EQ and NE are exchanged relative to radeon
+#	define CMP_MIX_MASK			0x00000100L
+#	define CMP_MIX_OR			0x00000000L
+#	define CMP_MIX_AND			0x00000100L   
 /*	?			BlockIOTag(0x107u) */
 #define OVERLAY_SCALE_INC	BlockIOTag(0x108u)
 #define OVERLAY_SCALE_CNTL	BlockIOTag(0x109u)

Index: mach64_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mach64_vid.c	25 Feb 2002 14:23:31 -0000	1.14
+++ mach64_vid.c	25 Feb 2002 16:16:44 -0000	1.15
@@ -577,7 +577,12 @@
     mach64_fifo_wait(3);
     OUTREG(OVERLAY_GRAPHICS_KEY_MSK, besr.graphics_key_msk);
     OUTREG(OVERLAY_GRAPHICS_KEY_CLR, besr.graphics_key_clr);
-    OUTREG(OVERLAY_KEY_CNTL,0x50);
+//    OUTREG(OVERLAY_VIDEO_KEY_MSK, 0x80);
+//    OUTREG(OVERLAY_VIDEO_KEY_CLR, 0x80);
+    if(besr.ckey_on)
+    	OUTREG(OVERLAY_KEY_CNTL,VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_EQ|CMP_MIX_AND);
+    else
+    	OUTREG(OVERLAY_KEY_CNTL,VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND);
 
     mach64_wait_for_idle();
     vf = INREG(VIDEO_FORMAT);