From 4a856e1d8dcfd01f7933e32d65a6cc1e0a6e4543 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Tue, 6 Dec 2005 14:50:49 +0000 Subject: [PATCH] overlay code now respects the B_OVERLAY_COLOR_KEY flag instead of forcing keying ON. Bumped version to 0.27. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15368 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/matrox/engine/mga_bes.c | 9 ++++++--- src/add-ons/accelerants/matrox/engine/mga_general.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/matrox/engine/mga_bes.c b/src/add-ons/accelerants/matrox/engine/mga_bes.c index a965f8a163..99c48f2b4b 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_bes.c +++ b/src/add-ons/accelerants/matrox/engine/mga_bes.c @@ -1,5 +1,5 @@ /* G200-G550 Back End Scaler functions */ -/* Written by Rudolf Cornelissen 05/2002-11/2004 */ +/* Written by Rudolf Cornelissen 05/2002-12/2005 */ #define MODULE_BIT 0x00000200 @@ -755,8 +755,11 @@ status_t gx00_configure_bes DXIW(COLMSK0GREEN, ow->green.mask); DXIW(COLMSK0BLUE, ow->blue.mask); - /* enable colorkeying */ - DXIW(KEYOPMODE,0x01); + /* setup colorkeying */ + if (ow->flags & B_OVERLAY_COLOR_KEY) + DXIW(KEYOPMODE,0x01); + else + DXIW(KEYOPMODE,0x00); /************************* diff --git a/src/add-ons/accelerants/matrox/engine/mga_general.c b/src/add-ons/accelerants/matrox/engine/mga_general.c index 1611182dee..af58618488 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_general.c +++ b/src/add-ons/accelerants/matrox/engine/mga_general.c @@ -54,7 +54,7 @@ status_t gx00_general_powerup() status_t status; uint32 card_class; - LOG(1,("POWERUP: Haiku Matrox Accelerant 0.26 running.\n")); + LOG(1,("POWERUP: Haiku Matrox Accelerant 0.27 running.\n")); /* log VBLANK INT usability status */ if (si->ps.int_assigned)