Integration of DAMAGE-XFIXES branch to trunk

    https://freedesktop.org/bugzilla/show_bug.cgi?id=859
These RENDER changes come from the experimental freedesktop tree formerly
    known as "Xserver". Partly motivated by compatibility with DAMAGE as
    pulled from that tree, also some of the code just is better
    implemented.
Modified Files: filter.c picture.c picture.h picturestr.h

1 files changed, 16 insertions, 17 deletions

diff --git a/render/picturestr.h b/render/picturestr.h
index bce59f532..f19fe9588 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -1,6 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.2 2004/04/23 19:54:29 eich Exp $ */
 /*
- * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $
+ * $Id$
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -39,7 +38,7 @@ typedef struct _DirectFormat {
 } DirectFormatRec;
 
 typedef struct _IndexFormat {
-    VisualPtr	    pVisual;
+    VisualID	    vid;
     ColormapPtr	    pColormap;
     int		    nvalues;
     xIndexValue	    *pValues;
@@ -103,11 +102,12 @@ typedef struct _Picture {
     int		    filter_nparams;
 } PictureRec;
 
+typedef Bool (*PictFilterValidateParamsProcPtr) (PicturePtr pPicture, int id,
+						 xFixed *params, int nparams);
 typedef struct {
-    char	    *name;
-    xFixed	    *params;
-    int		    nparams;
-    int		    id;
+    char			    *name;
+    int				    id;
+    PictFilterValidateParamsProcPtr ValidateParams;
 } PictFilterRec, *PictFilterPtr;
 
 #define PictFilterNearest	0
@@ -303,15 +303,6 @@ extern RESTYPE		GlyphSetType;
     } \
 } \
 
-void
-ResetPicturePrivateIndex (void);
-
-int
-AllocatePicturePrivateIndex (void);
-
-Bool
-AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount);
-
 Bool
 PictureDestroyWindow (WindowPtr pWindow);
 
@@ -349,7 +340,9 @@ char *
 PictureGetFilterName (int id);
 
 int
-PictureAddFilter (ScreenPtr pScreen, char *filter, xFixed *params, int nparams);
+PictureAddFilter (ScreenPtr			    pScreen,
+		  char				    *filter,
+		  PictFilterValidateParamsProcPtr   ValidateParams);
 
 Bool
 PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias);
@@ -405,6 +398,12 @@ SetPictureClipRects (PicturePtr	pPicture,
 		     xRectangle	*rects);
 
 int
+SetPictureClipRegion (PicturePtr    pPicture,
+		      int	    xOrigin,
+		      int	    yOrigin,
+		      RegionPtr	    pRegion);
+
+int
 SetPictureTransform (PicturePtr	    pPicture,
 		     PictTransform  *transform);