x11proto-dri2: Changes to 'debian-unstable'
configure.ac | 2 +-
debian/changelog | 11 +++++++++++
debian/control | 6 +++---
dri2proto.h | 19 +++++++++++++++++--
dri2proto.txt | 31 ++++++++++++++++++++++++-------
5 files changed, 56 insertions(+), 13 deletions(-)
New commits:
commit 5403a6d8490d95f071a98c577b77c4bbd589dcc5
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 15:23:56 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 52aa649..46d8a19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
+x11proto-dri2 (2.3-1) unstable; urgency=low
* New upstream release.
* Add myself to Uploaders.
@@ -7,7 +7,7 @@ x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
XORG_DEFAULT_OPTIONS in configure.ac).
* Bump Standards-Version from 3.8.2 to 3.8.4 (no changes needed).
- -- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 15:23:52 +0200
x11proto-dri2 (2.2-2) unstable; urgency=low
commit 1cab7234427986ff36b52b44d314efe9f037e879
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 15:17:17 2010 +0200
B-D on pkg-config, needed for PKG_PROG_PKG_CONFIG.
diff --git a/debian/changelog b/debian/changelog
index b66858e..52aa649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add myself to Uploaders.
* B-D explicitly on debhelper (>= 5), which matches debian/compat.
+ * B-D on pkg-config, needed for PKG_PROG_PKG_CONFIG (pulled through
+ XORG_DEFAULT_OPTIONS in configure.ac).
* Bump Standards-Version from 3.8.2 to 3.8.4 (no changes needed).
-- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
diff --git a/debian/control b/debian/control
index 4e5c9fa..82b6e43 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
-Build-Depends: debhelper (>= 5), autoconf, automake, xutils-dev (>= 1:7.5~1)
+Build-Depends: debhelper (>= 5), autoconf, automake, xutils-dev (>= 1:7.5~1), pkg-config
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit eb9415c36053190ac8393beeeec6884a0e54e2be
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 15:12:35 2010 +0200
Bump Standards-Version from 3.8.2 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 7cc5021..b66858e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add myself to Uploaders.
* B-D explicitly on debhelper (>= 5), which matches debian/compat.
+ * Bump Standards-Version from 3.8.2 to 3.8.4 (no changes needed).
-- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
diff --git a/debian/control b/debian/control
index 6076f91..4e5c9fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends: debhelper (>= 5), autoconf, automake, xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit b0e0428c6f3ffa12134242b13f58fa4ce8e262f2
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 15:11:27 2010 +0200
B-D explicitly on debhelper (>= 5), which matches debian/compat.
diff --git a/debian/changelog b/debian/changelog
index c1a4273..7cc5021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add myself to Uploaders.
+ * B-D explicitly on debhelper (>= 5), which matches debian/compat.
-- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
diff --git a/debian/control b/debian/control
index 9d3ba1f..6076f91 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
-Build-Depends: debhelper, autoconf, automake, xutils-dev (>= 1:7.5~1)
+Build-Depends: debhelper (>= 5), autoconf, automake, xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit 55f5e90c5e0071142fdac39a1ec245de54abe44b
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 04:20:08 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 447692c..c1a4273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
diff --git a/debian/control b/debian/control
index fab289a..9d3ba1f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-dri2
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Brice Goglin <bgoglin@debian.org>
+Uploaders: Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends: debhelper, autoconf, automake, xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
commit d7c02cd4d6c29ffa22a26a5c42e14eb81dca25a7
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 6 04:18:09 2010 +0200
New upstream release: 2.3
diff --git a/debian/changelog b/debian/changelog
index f148268..447692c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-dri2 (2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 06 Apr 2010 04:17:43 +0200
+
x11proto-dri2 (2.2-2) unstable; urgency=low
* Bump xutils-dev build dependencies to 1:7.5~1 for util-macros 1.3.0
commit 41045095bddfe460a76fb560e1d087430d8fd76f
Author: Francisco Jerez <currojerez@riseup.net>
Date: Mon Feb 8 19:24:37 2010 +0100
Define an event to notify clients about the validity of their buffers.
Bumps the protocol and package versions.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
diff --git a/configure.ac b/configure.ac
index fc96197..c5affe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.h b/dri2proto.h
index 43152c2..9708a4a 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -35,10 +35,10 @@
#define DRI2_NAME "DRI2"
#define DRI2_MAJOR 1
-#define DRI2_MINOR 2
+#define DRI2_MINOR 3
#define DRI2NumberErrors 0
-#define DRI2NumberEvents 1
+#define DRI2NumberEvents 2
#define DRI2NumberRequests 13
#define X_DRI2QueryVersion 0
@@ -59,6 +59,7 @@
* Events
*/
#define DRI2_BufferSwapComplete 0
+#define DRI2_InvalidateBuffers 1
typedef struct {
CARD32 attachment B32;
@@ -299,4 +300,18 @@ typedef struct {
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32
+typedef struct {
+ CARD8 type;
+ CARD8 pad;
+ CARD16 sequenceNumber B16;
+ CARD32 drawable B32;
+ CARD32 pad1 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xDRI2InvalidateBuffers;
+#define sz_xDRI2InvalidateBuffers 32
+
#endif
diff --git a/dri2proto.txt b/dri2proto.txt
index de58289..3d3eec4 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -125,9 +125,12 @@ or by using the OML swap buffers routine.
2.7 Events
-DRI2 provides a single event to indicate when a DRI2SwapBuffers request has
-been completed. This can be used to throttle drawing on the client side and
-tie into application main loops.
+DRI2 provides an event to indicate when a DRI2SwapBuffers request has
+been completed. This can be used to throttle drawing on the client
+side and tie into application main loops.
+
+Another event is generated when the validity of the requested buffers
+changes.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -333,10 +336,6 @@ The name of this extension is "DRI2".
Returns the swap count value when the swap will actually occur (e.g.
the last queued swap count + (pending swap count * swap interval)).
- The client should invalidate its render buffers after sending this
- request, causing a subsequent GetBuffers request to get updated buffer
- info.
-
This request is only available with protocol version 1.2 or
later.
@@ -459,6 +458,22 @@ The name of this extension is "DRI2".
the swap was performed with a blit, and DRI2_FLIP_COMPLETE, indicating
a full page flip was completed.
+┌───
+ DRI2InvalidateBuffers
+ ▶
+ drawable: CARD32
+└───
+
+ This event is generated when the buffers the client had
+ requested for 'drawable' (with DRI2GetBuffers or
+ DRI2GetBuffersWithFormat) become inappropriate because they
+ don't match the drawable dimensions anymore, or a buffer swap
+ has been performed.
+
+ Note that the server is only required to warn the client once
+ about this condition, until the client takes care of bringing
+ them back up-to-date with another GetBuffers request.
+
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
10. Extension Versioning
@@ -491,6 +506,8 @@ The DRI2 extension has undergone a number of revisions before
2.2: Approaching perfection. Added requests for swapbuffers,
MSC and SBC related requests, and events.
+ 2.3: Added the DRI2InvalidateBuffers event.
+
Compatibility up to 2.0 is not preserved, but was also never released.
Reply to: