Merge branch 'master' of git://people.freedesktop.org/~jbarnes/glproto

2 files changed, 19 insertions, 0 deletions

diff --git a/glxproto.h b/glxproto.h
index 68d38cc..4783fee 100644
--- a/glxproto.h
+++ b/glxproto.h
@@ -61,6 +61,7 @@
 **  extension and the client doesn't.
 */
 #define GLX_PbufferClobber	0
+#define GLX_BufferSwapComplete	1
 
 #define __GLX_NUMBER_EVENTS 17
 
@@ -1309,6 +1310,20 @@ typedef struct {
     CARD32 unused2 B32;
 } xGLXPbufferClobberEvent;
 
+typedef struct {
+    BYTE type;
+    BYTE pad;
+    CARD16 sequenceNumber B16;
+    CARD16 event_type B16;
+    CARD32 drawable;
+    CARD32 ust_hi B32;
+    CARD32 ust_lo B32;
+    CARD32 msc_hi B32;
+    CARD32 msc_lo B32;
+    CARD32 sbc_hi B32;
+    CARD32 sbc_lo B32;
+} xGLXBufferSwapComplete;
+
 /************************************************************************/
 
 /*
diff --git a/glxtokens.h b/glxtokens.h
index b22aec3..e7770ab 100644
--- a/glxtokens.h
+++ b/glxtokens.h
@@ -153,10 +153,14 @@ extern "C" {
 
 /* glXSelectEvent event mask bits */
 #define GLX_PBUFFER_CLOBBER_MASK	0x08000000
+#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK	0x10000000
 
 /* GLXPbufferClobberEvent event_type values */
 #define GLX_DAMAGED			0x8020
 #define GLX_SAVED			0x8021
+#define GLX_EXCHANGE_COMPLETE_INTEL	0x8024
+#define GLX_BLIT_COMPLETE_INTEL		0x8025
+#define GLX_FLIP_COMPLETE_INTEL		0x8026
 
 /* GLXPbufferClobberEvent draw_type values */
 #define GLX_WINDOW			0x8022