xserver/render filter.c, 1.3, 1.4 mipict.c, 1.20, 1.21 picture.c, 1.36, 1.37

[David Reveman]

Committed by: davidr

Update of /cvs/xserver/xserver/render
In directory gabe:/tmp/cvs-serv19724/render

Modified Files:
	filter.c mipict.c picture.c 
Log Message:
Added support for picture screen functions ChangePictureTransform and ChangePictureFilter

Index: filter.c
===================================================================
RCS file: /cvs/xserver/xserver/render/filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- filter.c	15 Jan 2004 09:03:47 -0000	1.3
+++ filter.c	4 Nov 2004 22:56:40 -0000	1.4
@@ -247,9 +247,10 @@
 SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int nparams)
 {
     ScreenPtr		pScreen = pPicture->pDrawable->pScreen;
+    PictureScreenPtr	ps = GetPictureScreen(pScreen);
     PictFilterPtr	pFilter = PictureFindFilter (pScreen, name, len);
     xFixed		*new_params;
-    int			i;
+    int			i, result;
 
     if (!pFilter)
 	return BadName;
@@ -273,5 +274,8 @@
     for (i = 0; i < nparams; i++)
 	pPicture->filter_params[i] = params[i];
     pPicture->filter = pFilter->id;
-    return Success;
+
+    result = (*ps->ChangePictureFilter) (pPicture, pPicture->filter,
+					 params, nparams);
+    return result;
 }

Index: mipict.c
===================================================================
RCS file: /cvs/xserver/xserver/render/mipict.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mipict.c	29 Jul 2004 08:10:15 -0000	1.20
+++ mipict.c	4 Nov 2004 22:56:40 -0000	1.21
@@ -248,6 +248,22 @@
     }
 }
 
+int
+miChangePictureTransform (PicturePtr	pPicture,
+			  PictTransform *transform)
+{
+    return Success;
+}
+
+int
+miChangePictureFilter (PicturePtr pPicture,
+		       int	  filter,
+		       xFixed     *params,
+		       int	  nparams)
+{
+    return Success;
+}
+
 #define BOUND(v)	(INT16) ((v) < MINSHORT ? MINSHORT : (v) > MAXSHORT ? MAXSHORT : (v))
 
 static __inline Bool
@@ -599,6 +615,8 @@
     ps->InitIndexed = miInitIndexed;
     ps->CloseIndexed = miCloseIndexed;
     ps->UpdateIndexed = miUpdateIndexed;
+    ps->ChangePictureTransform = miChangePictureTransform;
+    ps->ChangePictureFilter = miChangePictureFilter;
 
     /* MI rendering routines */
     ps->Composite	= 0;			/* requires DDX support */

Index: picture.c
===================================================================
RCS file: /cvs/xserver/xserver/render/picture.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- picture.c	29 Jul 2004 08:10:15 -0000	1.36
+++ picture.c	4 Nov 2004 22:56:40 -0000	1.37
@@ -1100,6 +1100,9 @@
 	{ 0x00000, xFixed1, 0x00000 },
 	{ 0x00000, 0x00000, xFixed1 },
     } };
+    ScreenPtr		pScreen = pPicture->pDrawable->pScreen;
+    PictureScreenPtr	ps = GetPictureScreen(pScreen);
+    int			result;
 
     if (transform && memcmp (transform, &identity, sizeof (PictTransform)) == 0)
 	transform = 0;
@@ -1122,7 +1125,8 @@
 	    pPicture->transform = 0;
 	}
     }
-    return Success;
+    result = (*ps->ChangePictureTransform) (pPicture, transform);
+    return result;
 }
 
 static void