[xserver-commit] xserver/composite compinit.c,1.10,1.11

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/composite
In directory pdx:/tmp/cvs-serv2073/composite

Modified Files:
	compinit.c 
Log Message:
2004-01-15  Keith Packard  <keithp@keithp.com>
	* composite/compinit.c: (compAddArgbVisual):
	* dix/colormap.c:
	* fb/fbcmap.c: (fbInitVisuals):
	* include/scrnintstr.h:
	Add alphaMask to visual so that pixel allocations for ARGB
	visuals can include an opaque pixel value.


Index: compinit.c
===================================================================
RCS file: /cvs/xserver/xserver/composite/compinit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- compinit.c	2 Dec 2003 01:59:38 -0000	1.10
+++ compinit.c	15 Jan 2004 08:53:44 -0000	1.11
@@ -208,6 +208,9 @@
     visual->offsetRed   = pPictFormat->direct.red;
     visual->offsetGreen = pPictFormat->direct.green;
     visual->offsetBlue  = pPictFormat->direct.blue;
+    visual->alphaMask = (((unsigned long) pPictFormat->direct.alphaMask) << 
+			 pPictFormat->direct.alpha);
+    visual->offsetAlpha = pPictFormat->direct.alpha;
 
     /*
      * Fix up the depth