ddraw: Fix transparent Blits on 8bit surfaces.

There are no red/green/blue bitmasks with color depth==8bpp. In that case always match against the whole byte.

ddraw: Fix transparent Blits on 8bit surfaces.
07fe82dd · Peter Beutner · Alexandre Julliard · 7d97f29c · 07fe82dd
Commit 07fe82dd authored Feb 25, 2006 by Peter Beutner Committed by Alexandre Julliard Feb 27, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

surface_dib.c dlls/ddraw/surface_dib.c +7 -1

No files found.
--- a/dlls/ddraw/surface_dib.c
+++ b/dlls/ddraw/surface_dib.c
@@ -849,7 +849,13 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst,
 		 keylow  = lpbltfx->ddckDestColorkey.dwColorSpaceLowValue;
 		 keyhigh = lpbltfx->ddckDestColorkey.dwColorSpaceHighValue;
 	      }
-	      keymask = sdesc.u4.ddpfPixelFormat.u2.dwRBitMask | sdesc.u4.ddpfPixelFormat.u3.dwGBitMask | sdesc.u4.ddpfPixelFormat.u4.dwBBitMask;
+
+		if(bpp == 1)
+			keymask = 0xff;
+		else
+			keymask = sdesc.u4.ddpfPixelFormat.u2.dwRBitMask | sdesc.u4.ddpfPixelFormat.u3.dwGBitMask |
+			          sdesc.u4.ddpfPixelFormat.u4.dwBBitMask;
+
 	      dwFlags &= ~(DDBLT_KEYSRC | DDBLT_KEYDEST | DDBLT_KEYSRCOVERRIDE | DDBLT_KEYDESTOVERRIDE);
           }