[Mplayer-cvslog] CVS: main/vidix/drivers mach64_vid.c,1.11,1.12

[Michael Niedermayer]

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

Modified Files:
	mach64_vid.c 
Log Message:
colorkey enabled ... until colorkey is correctly supported in vidix 


Index: mach64_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mach64_vid.c	24 Feb 2002 21:27:47 -0000	1.11
+++ mach64_vid.c	25 Feb 2002 02:05:30 -0000	1.12
@@ -543,7 +543,34 @@
 	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0ULL);
 	OUTREG(OVERLAY_KEY_CNTL,0x50);
     }
-
+switch(mach64_vid_get_dbpp()) //Ugly Hack (remove me if colorkey is correctly supported in vidix)
+{
+case 15: 
+	OUTREG(OVERLAY_GRAPHICS_KEY_MSK, 0x7FFF);
+	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0x7C1F);
+	OUTREG(OVERLAY_KEY_CNTL,0x50);
+	break;
+case 16: 
+	OUTREG(OVERLAY_GRAPHICS_KEY_MSK, 0xFFFF);
+	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0xF81F);
+	OUTREG(OVERLAY_KEY_CNTL,0x50);
+	break;
+case 24: 
+	OUTREG(OVERLAY_GRAPHICS_KEY_MSK, 0xFFFFFF);
+	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0xFF00FF);
+	OUTREG(OVERLAY_KEY_CNTL,0x50);
+	break;
+case 32: 
+	OUTREG(OVERLAY_GRAPHICS_KEY_MSK, 0xFFFFFF);
+	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0xFF00FF);
+	OUTREG(OVERLAY_KEY_CNTL,0x50);
+	break;
+default:
+	OUTREG(OVERLAY_GRAPHICS_KEY_MSK, 0);
+	OUTREG(OVERLAY_GRAPHICS_KEY_CLR, 0);
+	OUTREG(OVERLAY_KEY_CNTL,0x50);
+	break;
+}
     mach64_wait_for_idle();
     vf = INREG(VIDEO_FORMAT);