xserver/include mipict.h, 1.14, 1.15 picture.h, 1.22, 1.23 picturestr.h, 1.26, 1.27 renderedge.h, NONE, 1.1

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv18390/include

Modified Files:
	mipict.h picture.h picturestr.h 
Added Files:
	renderedge.h 
Log Message:
2004-07-29  Keith Packard  <keithp at keithp.com>

	* fb/Makefile.am:
	* fb/fbedge.c: (fbRasterizeEdges):
	* fb/fbedgeimp.h:
	* fb/fbpict.c: (fbPictureInit):
	* fb/fbpict.h:
	* fb/fbtrap.c: (fbAddTraps), (fbRasterizeTrapezoid), (_GreaterY),
	(_Clockwise), (fbAddTriangles):
	* include/mipict.h:
	* include/picture.h:
	* include/picturestr.h:
	* include/renderedge.h:
	* render/Makefile.am:
	* render/mipict.c: (miIsSolidAlpha), (miPictureInit):
	* render/mitrap.c: (miTrapezoids):
	* render/mitri.c: (miTriangles), (miTriStrip), (miTriFan):
	* render/picture.c: (AddTraps):
	* render/render.c: (RenderNumberRequests), (ProcRenderAddTraps),
	(SProcRenderAddTraps), (PanoramiXRenderAddTraps),
	(PanoramiXRenderInit):
	* render/renderedge.c: (RenderSampleCeilY), (RenderSampleFloorY),
	(RenderEdgeStep), (_RenderEdgeMultiInit), (RenderEdgeInit),
	(RenderLineFixedEdgeInit):
	Change polygon fill semantics to regular point sampling
	Add RenderAddTraps request


Index: mipict.h
===================================================================
RCS file: /cvs/xserver/xserver/include/mipict.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mipict.h	11 Sep 2003 05:12:51 -0000	1.14
+++ mipict.h	29 Jul 2004 08:10:15 -0000	1.15
@@ -124,6 +124,9 @@
 		      CARD32	    pixel,
 		      xRenderColor  *color);
 
+Bool
+miIsSolidAlpha (PicturePtr pSrc);
+
 void
 miCompositeRects (CARD8		op,
 		  PicturePtr	pDst,

Index: picture.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picture.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- picture.h	4 Jan 2004 22:44:42 -0000	1.22
+++ picture.h	29 Jul 2004 08:10:15 -0000	1.23
@@ -184,6 +184,11 @@
 # endif
 #endif
 
+typedef xFixed_32_32	xFixed_48_16;
+
+#define MAX_FIXED_48_16	    ((xFixed_48_16) 0x7fffffff)
+#define MIN_FIXED_48_16	    (-((xFixed_48_16) 1 << 31))
+
 typedef CARD32		xFixed_1_31;
 typedef CARD32		xFixed_1_16;
 typedef INT32		xFixed_16_16;

Index: picturestr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picturestr.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- picturestr.h	15 Jan 2004 09:03:47 -0000	1.26
+++ picturestr.h	29 Jul 2004 08:10:15 -0000	1.27
@@ -117,6 +117,10 @@
 #define PictFilterGood		3
 #define PictFilterBest		4
 
+#define PictFilterConvolution	5
+#define PictFilterGaussian	6
+#define PictFilterBinomial	7
+
 typedef struct {
     char	    *alias;
     int		    alias_id;
@@ -226,6 +230,18 @@
 					     int	    ndef,
 					     xColorItem	    *pdef);
 
+typedef void	(*AddTrapsProcPtr)	    (PicturePtr	    pPicture,
+					     INT16	    xOff,
+					     INT16	    yOff,
+					     int	    ntrap,
+					     xTrap	    *traps);
+
+typedef void	(*AddTrianglesProcPtr)	    (PicturePtr	    pPicture,
+					     INT16	    xOff,
+					     INT16	    yOff,
+					     int	    ntri,
+					     xTriangle	    *tris);
+
 typedef struct _PictureScreen {
     int				totalPictureSize;
     unsigned int		*PicturePrivateSizes;
@@ -273,6 +289,11 @@
     TriFanProcPtr		TriFan;
 
     RasterizeTrapezoidProcPtr	RasterizeTrapezoid;
+
+    AddTrianglesProcPtr		AddTriangles;
+
+    AddTrapsProcPtr		AddTraps;
+
 } PictureScreenRec, *PictureScreenPtr;
 
 extern int		PictureScreenPrivateIndex;
@@ -502,6 +523,13 @@
 int
 AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor);
 
+void
+AddTraps (PicturePtr	pPicture, 
+	  INT16		xOff,
+	  INT16		yOff,
+	  int		ntraps,
+	  xTrap		*traps);
+
 #ifdef PANORAMIX
 void PanoramiXRenderInit (void);
 void PanoramiXRenderReset (void);

--- NEW FILE: renderedge.h ---
(This appears to be a binary file; contents omitted.)