Add RenderAddTraps. Rewrite trapezoid rendering code.rel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1lg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branch

2 files changed, 30 insertions, 2 deletions

diff --git a/render.h b/render.h
index 48fb670..fbb832b 100644
--- a/render.h
+++ b/render.h
@@ -33,7 +33,7 @@ typedef unsigned long	PictFormat;
 
 #define RENDER_NAME	"RENDER"
 #define RENDER_MAJOR	0
-#define RENDER_MINOR	8
+#define RENDER_MINOR	9
 
 #define X_RenderQueryVersion		    0
 #define X_RenderQueryPictFormats	    1
@@ -68,8 +68,11 @@ typedef unsigned long	PictFormat;
 #define X_RenderSetPictureTransform	    28
 #define X_RenderQueryFilters		    29
 #define X_RenderSetPictureFilter	    30
+/* 0.8 */
 #define X_RenderCreateAnimCursor	    31
-#define RenderNumberRequests		    (X_RenderCreateAnimCursor+1)
+/* 0.9 */
+#define X_RenderAddTraps		    32
+#define RenderNumberRequests		    (X_RenderAddTraps+1)
 
 #define BadPictFormat			    0
 #define BadPicture			    1
diff --git a/renderproto.h b/renderproto.h
index 4b5da46..aecc77e 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -168,6 +168,18 @@ typedef struct {
 
 #define sz_xGlyphElt	8
 
+typedef struct {
+    Fixed   l, r, y;
+} xSpanFix;
+
+#define sz_xSpanFix	12
+
+typedef struct {
+    xSpanFix	top, bot;
+} xTrap;
+
+#define sz_xTrap	24
+
 /* 
  * requests and replies
  */
@@ -568,6 +580,19 @@ typedef struct {
 
 #define sz_xRenderCreateAnimCursorReq		    8
 
+/* 0.9 and higher */
+
+typedef struct {
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture;
+    INT16		xOff B16;
+    INT16		yOff B16;
+} xRenderAddTrapsReq;
+
+#define sz_xRenderAddTrapsReq			    12
+    
 #undef Window
 #undef Drawable
 #undef Font