dri2proto 1.99.3.

proto/dri2proto/Makefile.am

@@ -1,5 +1,5 @@
 dri2dir = $(includedir)/X11/extensions
-dri2_HEADERS = dri2proto.h
+dri2_HEADERS = dri2proto.h dri2tokens.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dri2proto.pc

proto/dri2proto/Makefile.in

@@ -138,10 +138,11 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dri2dir = $(includedir)/X11/extensions
-dri2_HEADERS = dri2proto.h
+dri2_HEADERS = dri2proto.h dri2tokens.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dri2proto.pc
 EXTRA_DIST = autogen.sh dri2proto.pc.in

proto/dri2proto/aclocal.m4

@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
+m4_if(AC_AUTOCONF_VERSION, [2.62],,
-[m4_warning([this file was generated for autoconf 2.61.
+[m4_warning([this file was generated for autoconf 2.62.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])

proto/dri2proto/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [1.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

proto/dri2proto/dri2proto.h

@@ -39,14 +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_DRI2ReemitDrawableInfo	5
+#define X_DRI2GetBuffers		5
+#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;
@@ -75,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 */
@@ -85,11 +95,11 @@ typedef struct {
     CARD16  sequenceNumber B16;
     CARD32  length B32;
     CARD32  driverNameLength B32;
-    CARD32  busIdLength B32;
+    CARD32  deviceNameLength B32;
-    CARD32  sareaHandle B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
+    CARD32  pad5 B32;
 } xDRI2ConnectReply;
 #define sz_xDRI2ConnectReply	32
 
@@ -97,10 +107,10 @@ typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
-    CARD32  screen B32;
+    CARD32  window B32;
     CARD32  magic B32;
-} xDRI2AuthConnectionReq;
+} xDRI2AuthenticateReq;
-#define sz_xDRI2AuthConnectionReq   12
+#define sz_xDRI2AuthenticateReq   12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
@@ -113,8 +123,8 @@ typedef struct {
     CARD32  pad4 B32;
     CARD32  pad5 B32;
     CARD32  pad6 B32;
-} xDRI2AuthConnectionReply;
+} xDRI2AuthenticateReply;
-#define sz_xDRI2AuthConnectionReply	32
+#define sz_xDRI2AuthenticateReply	32
 
 typedef struct {
     CARD8   reqType;
@@ -122,21 +132,7 @@ typedef struct {
     CARD16  length B16;
     CARD32  drawable B32;
 } xDRI2CreateDrawableReq;
-#define sz_xDRI2CreateDrawableReq	8
+#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;
@@ -144,28 +140,54 @@ typedef struct {
     CARD16  length B16;
     CARD32  drawable B32;
 } xDRI2DestroyDrawableReq;
-#define sz_xDRI2DestroyDrawableReq	8
+#define sz_xDRI2DestroyDrawableReq   8
 
 typedef struct {
     CARD8   reqType;
     CARD8   dri2ReqType;
     CARD16  length B16;
     CARD32  drawable B32;
-} xDRI2ReemitDrawableInfoReq;
+    CARD32  count B32;
-#define sz_xDRI2ReemitDrawableInfoReq   8
+} 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  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+} xDRI2GetBuffersReply;
+#define sz_xDRI2GetBuffersReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+    CARD32  region B32;
+    CARD32  dest B32;
+    CARD32  src B32;
+} xDRI2CopyRegionReq;
+#define sz_xDRI2CopyRegionReq   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;
+    CARD32  pad7 B32;
-#define sz_xDRI2ReemitDrawableInfoReply	32
+} xDRI2CopyRegionReply;
+#define sz_xDRI2CopyRegionReply	32
 
 #endif

proto/dri2proto/dri2tokens.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifndef _DRI2_TOKENS_H_
+#define _DRI2_TOKENS_H_
+
+#define DRI2BufferFrontLeft		0
+#define DRI2BufferBackLeft		1
+#define DRI2BufferFrontRight		2
+#define DRI2BufferBackRight		3
+#define DRI2BufferDepth			4
+#define DRI2BufferStencil		5
+#define DRI2BufferAccum			6
+#define DRI2BufferFakeFrontLeft		7
+#define DRI2BufferFakeFrontRight	8
+
+#define DRI2DriverDRI			0
+
+#endif