diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
| commit | 016747a04df9d4474489fe3b3d1c0f11a713148b (patch) | |
| tree | 69722f37ac06c00d6674c7bf2df6597753b418e6 /gl | |
| parent | 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (diff) | |
| parent | 52011cfedaa930d61d8f60b283a2051093727582 (diff) | |
| download | vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.gz vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.bz2 vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/configure.ac | 2 | ||||
| -rw-r--r-- | gl/glxproto.h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gl/configure.ac b/gl/configure.ac index d2b574371..e8117bc56 100644 --- a/gl/configure.ac +++ b/gl/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/gl/glxproto.h b/gl/glxproto.h index ee8f2c258..89fb6d982 100644 --- a/gl/glxproto.h +++ b/gl/glxproto.h @@ -1384,6 +1384,20 @@ typedef struct { CARD32 sbc_lo B32;
} xGLXBufferSwapComplete;
+typedef struct {
+ BYTE type;
+ BYTE pad;
+ CARD16 sequenceNumber B16;
+ CARD16 event_type B16;
+ CARD16 pad2;
+ CARD32 drawable;
+ CARD32 ust_hi B32;
+ CARD32 ust_lo B32;
+ CARD32 msc_hi B32;
+ CARD32 msc_lo B32;
+ CARD32 sbc B32;
+} xGLXBufferSwapComplete2;
+
/************************************************************************/
/*
|