xserver/include picturestr.h,1.28,1.29

Committed by: lars

Update of /cvs/xserver/xserver/include
In directory gabe:/tmp/cvs-serv17324/include

Modified Files:
	picturestr.h 
Log Message:
Fix projective transformations in fbcompose.c
Bugfix for convolution filters


Index: picturestr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picturestr.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- picturestr.h	26 Jan 2005 00:20:27 -0000	1.28
+++ picturestr.h	15 Jun 2005 12:13:57 -0000	1.29
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Keith Packard, SuSE, Inc.
@@ -69,7 +69,7 @@
     int		    refcnt;
     CARD32	    id;
     PicturePtr	    pNext;	    /* chain on same drawable */
-    
+
     unsigned int    repeat : 1;
     unsigned int    graphicsExposures : 1;
     unsigned int    subWindowMode : 1;
@@ -92,9 +92,9 @@
     unsigned long   serialNumber;
 
     RegionPtr	    pCompositeClip;
-    
+
     DevUnion	    *devPrivates;
-    
+
     PictTransform   *transform;
 
     int		    filter;
@@ -134,7 +134,7 @@
 					     pointer    value,
 					     int	n);
 typedef void	(*DestroyPictureClipProcPtr)(PicturePtr	pPicture);
-    
+
 typedef int	(*ChangePictureTransformProcPtr)    (PicturePtr	    pPicture,
 						     PictTransform  *transform);
 
@@ -261,12 +261,12 @@
     PictFormatPtr		formats;
     PictFormatPtr		fallback;
     int				nformats;
-    
+
     CreatePictureProcPtr	CreatePicture;
     DestroyPictureProcPtr	DestroyPicture;
     ChangePictureClipProcPtr	ChangePictureClip;
     DestroyPictureClipProcPtr	DestroyPictureClip;
-    
+
     ChangePictureProcPtr	ChangePicture;
     ValidatePictureProcPtr	ValidatePicture;
 
@@ -287,7 +287,7 @@
     UnrealizeGlyphProcPtr 	UnrealizeGlyph;
 
     int				subpixel;
-    
+
     PictFilterPtr		filters;
     int				nfilters;
     PictFilterAliasPtr		filterAliases;
@@ -296,7 +296,7 @@
     ChangePictureTransformProcPtr   ChangePictureTransform;
     ChangePictureFilterProcPtr	ChangePictureFilter;
     DestroyPictureFilterProcPtr	DestroyPictureFilter;
-    
+
     TrapezoidsProcPtr		Trapezoids;
     TrianglesProcPtr		Triangles;
     TriStripProcPtr		TriStrip;
@@ -367,7 +367,7 @@
 
 PictFormatPtr
 PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 format);
-    
+
 Bool
 PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
 
@@ -387,7 +387,7 @@
 
 Bool
 PictureSetDefaultFilters (ScreenPtr pScreen);
-    
+
 void
 PictureResetFilters (ScreenPtr pScreen);
 
@@ -402,7 +402,7 @@
 
 void
 SetPictureToDefaults (PicturePtr pPicture);
-    
+
 PicturePtr
 AllocatePicture (ScreenPtr  pScreen);
 
@@ -444,7 +444,7 @@
 int
 SetPictureTransform (PicturePtr	    pPicture,
 		     PictTransform  *transform);
-		     
+
 void
 ValidatePicture(PicturePtr pPicture);
 
@@ -532,6 +532,10 @@
 PictureTransformPoint (PictTransformPtr transform,
 		       PictVectorPtr	vector);
 
+Bool
+PictureTransformPoint3d (PictTransformPtr transform,
+                         PictVectorPtr	vector);
+
 void RenderExtensionInit (void);
 
 Bool
@@ -541,7 +545,7 @@
 AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor);
 
 void
-AddTraps (PicturePtr	pPicture, 
+AddTraps (PicturePtr	pPicture,
 	  INT16		xOff,
 	  INT16		yOff,
 	  int		ntraps,