xserver/hw/xgl xgl.h,1.7,1.8 xglcomp.c,1.4,1.5 xglpict.c,1.3,1.4

[David Reveman]

Committed by: davidr

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv28086/hw/xgl

Modified Files:
	xgl.h xglcomp.c xglpict.c 
Log Message:
Add dither support to Xgl

Index: xgl.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xgl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xgl.h	1 Feb 2005 21:22:02 -0000	1.7
+++ xgl.h	1 Mar 2005 16:34:31 -0000	1.8
@@ -320,6 +320,7 @@
 #define xglPCFilterMask		(1L << 1)
 #define xglPCTransformMask 	(1L << 2)
 #define xglPCComponentAlphaMask (1L << 3)
+#define xglPCDitherMask		(1L << 4)
 
 #define xglPFFilterMask		(1L << 8)
 

Index: xglcomp.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcomp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xglcomp.c	11 Feb 2005 20:19:20 -0000	1.4
+++ xglcomp.c	1 Mar 2005 16:34:31 -0000	1.5
@@ -71,9 +71,6 @@
     RegionRec	    region;
     BoxPtr	    pBox;
     int		    nBox;
-
-    if (pDst->dither != None)
-	return FALSE;
     
     if (pDst->alphaMap)
 	return FALSE;

Index: xglpict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglpict.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglpict.c	26 Jan 2005 10:58:52 -0000	1.3
+++ xglpict.c	1 Mar 2005 16:34:31 -0000	1.4
@@ -164,6 +164,9 @@
     if (pPicture->stateChanges & CPComponentAlpha)
 	pPixmapPriv->pictureMask |= xglPCComponentAlphaMask;
 
+    if (pPicture->stateChanges & CPDither)
+	pPixmapPriv->pictureMask |= xglPCDitherMask;
+
     XGL_PICTURE_SCREEN_UNWRAP (ChangePicture);
     (*pPictureScreen->ChangePicture) (pPicture, mask);
     XGL_PICTURE_SCREEN_WRAP (ChangePicture, xglChangePicture);
@@ -269,6 +272,14 @@
 	    glitz_surface_set_component_alpha (surface, 0);
     }
 
+    if (pPixmapPriv->pictureMask & xglPCDitherMask)
+    {
+	if (pPicture->dither)
+	    glitz_surface_set_dither (surface, 1);
+	else
+	    glitz_surface_set_dither (surface, 0);
+    }
+
     pPixmapPriv->pictureMask &= ~XGL_PICTURE_CHANGES (~0);
 }