1 files changed, 42 insertions, 21 deletions

diff --git a/dri2proto.h b/dri2proto.h
index 3e1727d..c355c2b 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -46,7 +46,8 @@
 #define X_DRI2AuthConnection		2
 #define X_DRI2CreateDrawable		3
 #define X_DRI2DestroyDrawable		4
-#define X_DRI2ReemitDrawableInfo	5
+#define X_DRI2GetBuffers		5
+#define X_DRI2SwapBuffers		6
 
 typedef struct {
     CARD8   reqType;
@@ -86,10 +87,10 @@ typedef struct {
     CARD32  length B32;
     CARD32  driverNameLength B32;
     CARD32  busIdLength B32;
-    CARD32  sareaHandle B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
+    CARD32  pad5 B32;
 } xDRI2ConnectReply;
 #define sz_xDRI2ConnectReply	32
 
@@ -125,20 +126,6 @@ typedef struct {
 #define sz_xDRI2CreateDrawableReq	8
 
 typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  handle B32;
-    CARD32  head B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xDRI2CreateDrawableReply;
-#define sz_xDRI2CreateDrawableReply	32
-
-typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
@@ -147,25 +134,59 @@ typedef struct {
 #define sz_xDRI2DestroyDrawableReq	8
 
 typedef struct {
+    CARD32  attachment B32;
+    CARD32  name B32;
+    CARD32  pitch B32;
+    CARD32  cpp B32;
+    CARD32  flags B32;
+} xDRI2Buffer;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+    CARD32  count B32;
+} xDRI2GetBuffersReq;
+#define sz_xDRI2GetBuffersReq   12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  width B32;
+    CARD32  height B32;
+    CARD32  count B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad6 B32;
+} xDRI2GetBuffersReply;
+#define sz_xDRI2GetBuffersReply	32
+
+typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
     CARD32  drawable B32;
-} xDRI2ReemitDrawableInfoReq;
-#define sz_xDRI2ReemitDrawableInfoReq   8
+    INT16   x B16, y B16;
+    CARD16  width B16, height B16;
+    CARD32  flags B32;
+} xDRI2SwapBuffersReq;
+#define sz_xDRI2SwapBuffersReq   20
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    CARD32  head B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
     CARD32  pad5 B32;
     CARD32  pad6 B32;
-} xDRI2ReemitDrawableInfoReply;
-#define sz_xDRI2ReemitDrawableInfoReply	32
+    CARD32  pad7 B32;
+} xDRI2SwapBuffersReply;
+#define sz_xDRI2SwapBuffersReply	32
 
 #endif