diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 13:47:27 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 13:47:27 +0000 |
| commit | 6ec118aa5be37843a81e50ff19a9a3a702cbd9a2 (patch) | |
| tree | eac524c75997417e7b2817e8bb1aaf7d7742ba2c /vidix | |
| parent | 836d21907540f1c9c1c3cfa6d5532ebb4928034d (diff) | |
| download | mpv-6ec118aa5be37843a81e50ff19a9a3a702cbd9a2.tar.bz2 mpv-6ec118aa5be37843a81e50ff19a9a3a702cbd9a2.tar.xz | |
-nocolorkey support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11218 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/drivers/mga_vid.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/vidix/drivers/mga_vid.c b/vidix/drivers/mga_vid.c index 3a5399b55f..0a0e74e857 100644 --- a/vidix/drivers/mga_vid.c +++ b/vidix/drivers/mga_vid.c @@ -380,8 +380,8 @@ static void mga_vid_write_regs(int restore) // restore it colkey_saved=0; - printf("[mga] Restoring colorkey (ON: %d %02X:%02X:%02X)\n", - colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); +// printf("[mga] Restoring colorkey (ON: %d %02X:%02X:%02X)\n", +// colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); // Set color key registers: writeb( XKEYOPMODE, mga_mmio_base + PALWTADD); @@ -430,8 +430,8 @@ static void mga_vid_write_regs(int restore) writeb( XCOLMSK, mga_mmio_base + PALWTADD); colkey_mask[3]=(unsigned char)readb(mga_mmio_base + X_DATAREG); - printf("[mga] Saved colorkey (ON: %d %02X:%02X:%02X)\n", - colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); +// printf("[mga] Saved colorkey (ON: %d %02X:%02X:%02X)\n", +// colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); } @@ -471,6 +471,10 @@ if(!restore){ break; } + // Enable colorkeying + writeb( XKEYOPMODE, mga_mmio_base + PALWTADD); + writeb( 1, mga_mmio_base + X_DATAREG); + // Disable color keying on alpha channel writeb( XCOLMSK, mga_mmio_base + PALWTADD); writeb( 0x00, mga_mmio_base + X_DATAREG); @@ -494,7 +498,12 @@ if(!restore){ writeb( XCOLMSK0BLUE, mga_mmio_base + PALWTADD); writeb( 0xff, mga_mmio_base + X_DATAREG); } - + else + { + // Disable colorkeying + writeb( XKEYOPMODE, mga_mmio_base + PALWTADD); + writeb( 0, mga_mmio_base + X_DATAREG); + } } // Backend Scaler |