From eff156110e6be00550633bd04c449a82fc078774 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 15 Sep 2004 16:33:02 +0000 Subject: Pull XORG-6_8_0 to CYGWIN branch --- render.h | 9 ++++++--- renderproto.h | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/render.h b/render.h index e44754c..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 @@ -150,7 +153,7 @@ typedef unsigned long PictFormat; #define CPPolyMode (1 << 10) #define CPDither (1 << 11) #define CPComponentAlpha (1 << 12) -#define CPLastBit 11 +#define CPLastBit 12 /* Filters included in 0.6 */ #define FilterNearest "nearest" 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 -- cgit v1.2.3