summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 02:05:30 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 02:05:30 +0000
commit3605aa4ec8d0130984aeb402d8f5e9df5d747bfe (patch)
tree3e8c4c2364560c3da7f95e155332e2fab162b707 /vidix
parent54ae2281a6805ad8660512a2586e352d90316efe (diff)
downloadmpv-3605aa4ec8d0130984aeb402d8f5e9df5d747bfe.tar.bz2
mpv-3605aa4ec8d0130984aeb402d8f5e9df5d747bfe.tar.xz
colorkey enabled ... until colorkey is correctly supported in vidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4854 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/drivers/mach64_vid.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c
index 2ba42862c4..c7dd06c295 100644
--- a/vidix/drivers/mach64_vid.c
+++ b/vidix/drivers/mach64_vid.c
@@ -543,7 +543,34 @@ static void mach64_vid_display_video( void )
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);