final part of XFree86 4.2.99.2 mergeX_4_2_99_2-20021023-merge

6 files changed, 168 insertions, 13 deletions

diff --git a/xc/include/GL/Imakefile b/xc/include/GL/Imakefile
index 057df659c..8bf4d5cfb 100644
--- a/xc/include/GL/Imakefile
+++ b/xc/include/GL/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/include/GL/Imakefile,v 1.13 2001/04/30 14:58:48 dawes Exp $
+XCOMM $XFree86: xc/include/GL/Imakefile,v 1.14 2002/02/22 21:32:50 dawes Exp $
 
 LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
 LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h
index 05300fc86..7442acf8b 100644
--- a/xc/include/GL/glx.h
+++ b/xc/include/GL/glx.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glx_h__
 #define __GLX_glx_h__
 
-/* $XFree86: xc/include/GL/glx.h,v 1.8 2001/03/21 15:51:38 dawes Exp $ */
+/* $XFree86: xc/include/GL/glx.h,v 1.9 2002/02/22 21:32:50 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
diff --git a/xc/include/GL/glxtokens.h b/xc/include/GL/glxtokens.h
index e30c579b3..af21475b1 100644
--- a/xc/include/GL/glxtokens.h
+++ b/xc/include/GL/glxtokens.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glxtokens_h__
 #define __GLX_glxtokens_h__
 
-/* $XFree86: xc/include/GL/glxtokens.h,v 1.5 2001/03/21 15:51:38 dawes Exp $ */
+/* $XFree86: xc/include/GL/glxtokens.h,v 1.6 2002/02/22 21:32:50 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index 762782a91..2f9717d07 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
 
 
 
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.47 2001/12/16 18:19:50 keithp Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.49 2002/10/16 00:31:25 dawes Exp $
 
 #if BuildScreenSaverExt || BuildScreenSaveLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
@@ -48,27 +48,36 @@ RANDRHEADERS = randr.h randrproto.h
 XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
 	xtraplibp.h xtrapproto.h
 #endif
+#if BuildXResExt || BuildXResLibrary
+XRESHEADERS = XRes.h XResproto.h
+#endif
 
 EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
 	       $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
 	       $(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \
 	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
-	       $(XTRAPHEADERS)
+	       $(XTRAPHEADERS) $(XRESHEADERS)
 
 
 
-HEADERS = Xext.h multibuf.h shape.h sync.h XShm.h MITMisc.h \
+HEADERS = Xext.h \
+	xcmiscstr.h \
+	MITMisc.h mitmiscstr.h \
+	bigreqstr.h \
+	extutil.h \
 	XI.h XInput.h XIproto.h \
-	XTest.h xtestext1.h \
+	XTest.h xtestext1.h xteststr.h \
 	XIE.h XIEproto.h XIEprotost.h \
 	XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
 	Xdbe.h Xdbeproto.h \
 	Xag.h Xagstr.h Xagsrv.h \
+	XShm.h shmstr.h \
 	$(EXTRAHEADERS) \
+	multibuf.h multibufst.h \
 	record.h recordstr.h \
-        lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h \
-        lbxopts.h lbxstr.h lbxzlib.h \
 	security.h securstr.h \
+	shape.h shapestr.h \
+	sync.h syncstr.h \
 	Print.h Printstr.h \
 	Xcup.h Xcupstr.h \
 	dpms.h dpmsstr.h \
diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h
index aa17588c6..5f6b3e9bb 100644
--- a/xc/include/extensions/renderproto.h
+++ b/xc/include/extensions/renderproto.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.9 2001/09/07 16:21:15 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -126,12 +126,28 @@ typedef struct {
 #define sz_xPointFixed	8
 
 typedef struct {
+    xPointFixed	p1;
+    xPointFixed p2;
+} xLineFixed;
+
+#define sz_xLineFixed	16
+
+typedef struct {
     xPointFixed	p1, p2, p3;
 } xTriangle;
 
 #define sz_xTriangle	24
 
 typedef struct {
+    Fixed	top B32;
+    Fixed	bottom B32;
+    xLineFixed	left;
+    xLineFixed	right;
+} xTrapezoid;
+
+#define sz_xTrapezoid	40
+
+typedef struct {
     CARD16  width B16;
     CARD16  height B16;
     INT16   x B16;
@@ -197,7 +213,7 @@ typedef struct {
     CARD32  numScreens B32;
     CARD32  numDepths B32;
     CARD32  numVisuals B32;
-    CARD32  pad4 B32;
+    CARD32  numSubpixel B32;	    /* Version 0.6 */
     CARD32  pad5 B32;
 } xRenderQueryPictFormatsReply;
 
@@ -313,13 +329,65 @@ typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
+} xRenderTrapezoidsReq;
+
+#define sz_xRenderTrapezoidsReq			    24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
     Picture	src B32;
     Picture	dst B32;
+    PictFormat	maskFormat B32;
     INT16	xSrc B16;
     INT16	ySrc B16;
 } xRenderTrianglesReq;
 
-#define sz_xRenderTrianglesReq			    16
+#define sz_xRenderTrianglesReq			    24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
+} xRenderTriStripReq;
+
+#define sz_xRenderTriStripReq			    24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
+} xRenderTriFanReq;
+
+#define sz_xRenderTriFanReq			    24
 
 typedef struct {
     CARD8       reqType;
@@ -404,6 +472,84 @@ typedef struct {
 
 #define sz_xRenderFillRectanglesReq		    20
 
+/* 0.5 and higher */
+
+typedef struct {
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Cursor	cid B32;
+    Picture	src B32;
+    CARD16	x B16;
+    CARD16	y B16;
+} xRenderCreateCursorReq;
+
+#define sz_xRenderCreateCursorReq		    16
+
+/* 0.6 and higher */
+
+/*
+ * This can't use an array because 32-bit values may be in bitfields
+ */
+typedef struct {
+    Fixed	matrix11 B32;
+    Fixed	matrix12 B32;
+    Fixed	matrix13 B32;
+    Fixed	matrix21 B32;
+    Fixed	matrix22 B32;
+    Fixed	matrix23 B32;
+    Fixed	matrix31 B32;
+    Fixed	matrix32 B32;
+    Fixed	matrix33 B32;
+} xRenderTransform;
+
+#define sz_xRenderTransform 36
+
+typedef struct {
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture B32;
+    xRenderTransform	transform;
+} xRenderSetPictureTransformReq;
+
+#define sz_xRenderSetPictureTransformReq	    44
+
+typedef struct {
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Drawable		drawable B32;
+} xRenderQueryFiltersReq;
+
+#define sz_xRenderQueryFiltersReq		    8
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  numAliases B32;	/* LISTofCARD16 */
+    CARD32  numFilters B32;	/* LISTofSTRING8 */
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+} xRenderQueryFiltersReply;
+
+#define sz_xRenderQueryFiltersReply		    32
+
+typedef struct {
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture B32;
+    CARD16		nbytes B16; /* number of bytes in name */
+    CARD16		pad B16;
+} xRenderSetPictureFilterReq;
+
+#define sz_xRenderSetPictureFilterReq		    12
+    
 #undef Window
 #undef Drawable
 #undef Font
diff --git a/xc/include/extensions/xtrapproto.h b/xc/include/extensions/xtrapproto.h
index b3e29cfaa..9b0578216 100644
--- a/xc/include/extensions/xtrapproto.h
+++ b/xc/include/extensions/xtrapproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.2 2002/02/22 21:32:51 dawes Exp $ */
 
 #ifndef __XTRAPPROTO__
 #define __XTRAPPROTO__