Add protocol documentation, update to DRI2CopyRegion request.

1 files changed, 32 insertions, 30 deletions

diff --git a/dri2proto.h b/dri2proto.h
index c355c2b..827b358 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -39,15 +39,23 @@
 
 #define DRI2NumberErrors		0
 #define DRI2NumberEvents		0
-#define DRI2NumberRequests		6
+#define DRI2NumberRequests		7
 
 #define X_DRI2QueryVersion		0
 #define X_DRI2Connect			1
-#define X_DRI2AuthConnection		2
+#define X_DRI2Authenticate		2
 #define X_DRI2CreateDrawable		3
 #define X_DRI2DestroyDrawable		4
 #define X_DRI2GetBuffers		5
-#define X_DRI2SwapBuffers		6
+#define X_DRI2CopyRegion		6
+
+typedef struct {
+    CARD32  attachment B32;
+    CARD32  name B32;
+    CARD32  pitch B32;
+    CARD32  cpp B32;
+    CARD32  flags B32;
+} xDRI2Buffer;
 
 typedef struct {
     CARD8   reqType;
@@ -76,9 +84,10 @@ typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
-    CARD32  screen B32;
+    CARD32  window B32;
+    CARD32  driverType B32;
 } xDRI2ConnectReq;
-#define sz_xDRI2ConnectReq   8
+#define sz_xDRI2ConnectReq	12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
@@ -86,7 +95,7 @@ typedef struct {
     CARD16  sequenceNumber B16;
     CARD32  length B32;
     CARD32  driverNameLength B32;
-    CARD32  busIdLength B32;
+    CARD32  deviceNameLength B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
@@ -98,10 +107,10 @@ typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
-    CARD32  screen B32;
+    CARD32  window B32;
     CARD32  magic B32;
-} xDRI2AuthConnectionReq;
-#define sz_xDRI2AuthConnectionReq   12
+} xDRI2AuthenticateReq;
+#define sz_xDRI2AuthenticateReq   12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
@@ -114,8 +123,8 @@ typedef struct {
     CARD32  pad4 B32;
     CARD32  pad5 B32;
     CARD32  pad6 B32;
-} xDRI2AuthConnectionReply;
-#define sz_xDRI2AuthConnectionReply	32
+} xDRI2AuthenticateReply;
+#define sz_xDRI2AuthenticateReply	32
 
 typedef struct {
     CARD8   reqType;
@@ -123,7 +132,7 @@ typedef struct {
     CARD16  length B16;
     CARD32  drawable B32;
 } xDRI2CreateDrawableReq;
-#define sz_xDRI2CreateDrawableReq	8
+#define sz_xDRI2CreateDrawableReq   8
 
 typedef struct {
     CARD8   reqType;
@@ -131,15 +140,7 @@ typedef struct {
     CARD16  length B16;
     CARD32  drawable B32;
 } xDRI2DestroyDrawableReq;
-#define sz_xDRI2DestroyDrawableReq	8
-
-typedef struct {
-    CARD32  attachment B32;
-    CARD32  name B32;
-    CARD32  pitch B32;
-    CARD32  cpp B32;
-    CARD32  flags B32;
-} xDRI2Buffer;
+#define sz_xDRI2DestroyDrawableReq   8
 
 typedef struct {
     CARD8   reqType;
@@ -158,9 +159,9 @@ typedef struct {
     CARD32  width B32;
     CARD32  height B32;
     CARD32  count B32;
+    CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
-    CARD32  pad6 B32;
 } xDRI2GetBuffersReply;
 #define sz_xDRI2GetBuffersReply	32
 
@@ -169,24 +170,25 @@ typedef struct {
     CARD8   dri2ReqType;
     CARD16  length B16;
     CARD32  drawable B32;
-    INT16   x B16, y B16;
-    CARD16  width B16, height B16;
-    CARD32  flags B32;
-} xDRI2SwapBuffersReq;
-#define sz_xDRI2SwapBuffersReq   20
+    CARD32  region B32;
+    CARD32  dest B32;
+    CARD32  src B32;
+    CARD32  bitmask B32;
+} xDRI2CopyRegionReq;
+#define sz_xDRI2CopyRegionReq   24
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
+    CARD32  bitmask B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
     CARD32  pad5 B32;
     CARD32  pad6 B32;
-    CARD32  pad7 B32;
-} xDRI2SwapBuffersReply;
-#define sz_xDRI2SwapBuffersReply	32
+} xDRI2CopyRegionReply;
+#define sz_xDRI2CopyRegionReply	32
 
 #endif