4.0.1g merge

1 files changed, 26 insertions, 2 deletions

diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h
index dcd83e906..9b7433115 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.4 2000/10/07 05:59:32 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.5 2000/11/20 07:13:09 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -103,12 +103,21 @@ typedef struct {
     CARD16	red B16;
     CARD16	green B16;
     CARD16	blue B16;
-    CARD16	pad B16;
+    CARD16	alpha B16;
 } xIndexValue;
 
 #define sz_xIndexValue	12
 
 typedef struct {
+    CARD16	red B16;
+    CARD16	green B16;
+    CARD16	blue B16;
+    CARD16	alpha B16;
+} xRenderColor;
+
+#define sz_xRenderColor	8
+
+typedef struct {
     Fixed	x B32;
     Fixed	y B32;
 } xPointFixed;
@@ -379,6 +388,21 @@ xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
 #define sz_xRenderCompositeGlyphs16Req		    28
 #define sz_xRenderCompositeGlyphs32Req		    28
 
+/* 0.1 and higher */
+
+typedef struct {
+    CARD8	reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	dst B32;
+    xRenderColor    color;
+} xRenderFillRectanglesReq;
+
+#define sz_xRenderFillRectanglesReq		    20
+
 #undef Window
 #undef Drawable
 #undef Font