# HG changeset patch # User michael # Date 1014602730 0 # Node ID 2853640cea584ad18286fdf23ea1034468c94aa4 # Parent 534e7b5aaadb5cf69c2a22f10b2b5b12eb4d54bc colorkey enabled ... until colorkey is correctly supported in vidix diff -r 534e7b5aaadb -r 2853640cea58 vidix/drivers/mach64_vid.c --- a/vidix/drivers/mach64_vid.c Sun Feb 24 21:57:16 2002 +0000 +++ b/vidix/drivers/mach64_vid.c Mon Feb 25 02:05:30 2002 +0000 @@ -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);