ChangeLog | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 - debian/changelog | 7 ++++ debian/control | 2 - dri2proto.h | 5 +-- dri2proto.txt | 67 +++++++++++++++++++++++++++++++++++++++++- dri2tokens.h | 1 7 files changed, 165 insertions(+), 6 deletions(-)
New commits: commit d4a30d665a4da686f2f6dabc5741610c52a218eb Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 19 17:30:46 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 87d5e6f..2dc9fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x11proto-dri2 (2.1-1) UNRELEASED; urgency=low +x11proto-dri2 (2.1-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.8.2. - -- Julien Cristau <jcris...@debian.org> Fri, 19 Jun 2009 13:07:49 +0200 + -- Julien Cristau <jcris...@debian.org> Fri, 19 Jun 2009 17:30:30 +0200 x11proto-dri2 (2.0-1) unstable; urgency=low commit a4e5819332bd66b804eb0b8d0e820096e7224b8d Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 19 13:41:00 2009 +0200 Bump Standards-Version to 3.8.2. diff --git a/debian/changelog b/debian/changelog index 7fe68b2..87d5e6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-dri2 (2.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.2. -- Julien Cristau <jcris...@debian.org> Fri, 19 Jun 2009 13:07:49 +0200 diff --git a/debian/control b/debian/control index c47227c..5461535 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Julien Cristau <jcris...@debian.org> Build-Depends: debhelper, autoconf, automake, xutils-dev (>= 1:7.4+4) -Standards-Version: 3.8.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 f0a8ae9d6521719edc15507442c160145a5c2bb2 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 19 13:08:53 2009 +0200 Update changelogs diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..6a11395 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,87 @@ +commit 66c56ab10d917e3f47f93178d7eac6430970d3c4 +Author: Ian Romanick <i...@freedesktop.org> +Date: Mon Apr 20 21:16:24 2009 -0700 + + Add protocol for DRI2GetBuffersWithFormat + + This function replaces DRI2GetBuffers. + + Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> + Reviewed-by: Kristian Høgsberg <k...@redhat.com> + +commit a223ab5e6a215d86e4bf072369b331506f689f83 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Apr 20 14:08:19 2009 -0400 + + Bump to 2.0 and release + +commit f46b6ca29b2da54cf6e6db57d464bea9476594c6 +Author: Julien Cristau <jcris...@debian.org> +Date: Fri Jan 9 06:07:59 2009 +0100 + + Distribute the protocol documentation + +commit ac787752bf67f8f1ea8167191e5fb9d7fbbe7c7f +Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br> +Date: Tue Jan 27 20:06:28 2009 -0200 + + Janitor: Correct make distcheck and dont distribute autogen.sh + +commit 65c7097d549ada25d11738b15996b18c9e57a847 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Dec 1 20:57:40 2008 -0500 + + Bump to 1.99.3 and back out the value bitmask from the CopyRegion request. + +commit f7b737bef90df4430ac491d65accc7742bc6ca38 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Dec 1 14:01:42 2008 -0500 + + Bump version to 1.99.2. + +commit 8cab3f0e6f551220bd11074779f4ccec1e948e00 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Tue Oct 14 23:19:15 2008 -0400 + + Add protocol documentation, update to DRI2CopyRegion request. + +commit abb1edc487543c26856afdbe6a7e2c088a1e82ee +Author: Kristian Høgsberg <k...@redhat.com> +Date: Tue Aug 12 12:52:33 2008 -0400 + + Update to 1.99.1 - drop sarea and perform swap buffer in X server. + + Still to resolve is the swap buffer request. It should probably be + broken into two requests, one to post the swap request and one to wait + for it to be completed. Also, need to find a good solution to + CopySubBuffer that doesn't require a roundtrip per rectangle. + + Don't need to solve all this for 2.0, though, can add requests later on. + +commit b9d7a0c1b0f5b40dfe8ca7a33693198bf91244ca +Author: Kristian Høgsberg <k...@redhat.com> +Date: Wed Apr 2 19:11:32 2008 -0400 + + Adjust pkg-config cflags to match other proto modules. + +commit b515bee843d5ab91fc0fe30b8eb13aadd69b5131 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Wed Mar 26 16:00:05 2008 -0400 + + Add reemitDrawableInfo protocol. + + Also, remove the screen number where it's redundant and rename + drmDrawable in the create drawable request to just 'handle' now that + we don't rely on drm drawables. + +commit d2c2ffde8f3762af30ea6953d8a10b487f78733e +Author: Kristian Høgsberg <k...@redhat.com> +Date: Wed Mar 12 17:50:34 2008 -0400 + + Fix typo in xDRI2QueryVersionReq req type field. + +commit 672baf47cc5dfcdad4e70b4745e3316b209089a3 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Tue Mar 11 00:12:55 2008 -0400 + + Initial commit. diff --git a/debian/changelog b/debian/changelog index 45d6f59..7fe68b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-dri2 (2.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <jcris...@debian.org> Fri, 19 Jun 2009 13:07:49 +0200 + x11proto-dri2 (2.0-1) unstable; urgency=low * New upstream release. commit 66c56ab10d917e3f47f93178d7eac6430970d3c4 Author: Ian Romanick <i...@freedesktop.org> Date: Mon Apr 20 21:16:24 2009 -0700 Add protocol for DRI2GetBuffersWithFormat This function replaces DRI2GetBuffers. Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Kristian Høgsberg <k...@redhat.com> diff --git a/configure.ac b/configure.ac index 234426c..2d8fdc8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([DRI2Proto], [2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([DRI2Proto], [2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG diff --git a/dri2proto.h b/dri2proto.h index dc3f2d1..8d76079 100644 --- a/dri2proto.h +++ b/dri2proto.h @@ -35,11 +35,11 @@ #define DRI2_NAME "DRI2" #define DRI2_MAJOR 1 -#define DRI2_MINOR 0 +#define DRI2_MINOR 1 #define DRI2NumberErrors 0 #define DRI2NumberEvents 0 -#define DRI2NumberRequests 7 +#define DRI2NumberRequests 8 #define X_DRI2QueryVersion 0 #define X_DRI2Connect 1 @@ -48,6 +48,7 @@ #define X_DRI2DestroyDrawable 4 #define X_DRI2GetBuffers 5 #define X_DRI2CopyRegion 6 +#define X_DRI2GetBuffersWithFormat 7 typedef struct { CARD32 attachment B32; diff --git a/dri2proto.txt b/dri2proto.txt index 106f8d8..e931bfb 100644 --- a/dri2proto.txt +++ b/dri2proto.txt @@ -142,7 +142,8 @@ DRI2ATTACHMENT { DRI2BufferFrontLeft DRI2BufferStencil DRI2BufferAccum DRI2BufferFakeFrontLeft - DRI2BufferFakeFrontRight } + DRI2BufferFakeFrontRight + DRI2BufferDepthStencil } These values describe various attachment points for DRI2 buffers. @@ -159,6 +160,13 @@ DRI2BUFFER { attachment: CARD32 underlying kernel buffer, +DRI2ATTACH_FORMAT { attachment: CARD32 + format: CARD32 } + + The DRI2ATTACH_FORMAT describes an attachment and the associated + format. 'attachment' describes the attachment point for the buffer, + 'format' describes an opaque, device-dependent format for the buffer. + ⚙ ⚙ ⚙ ⚙ ⚙ ⚙ @@ -281,6 +289,31 @@ The name of this extension is "DRI2". rendering the next frame. +┌─── + DRI2GetBuffersWithFormat + drawable: DRAWABLE + attachments: LISTofDRI2ATTACH_FORMAT + ▶ + width, height: CARD32 + buffers: LISTofDRI2BUFFER +└─── + Errors: Window + + Get buffers for the provided attachment points with the specified + formats for the given drawable. + + If the DDX driver does not support one or more of the + specified attachment points or formats, a Value error is generated, + with the first unsupported attachment point as the error value. + + 'width' and 'height' describes the dimensions of the drawable. + + 'buffers' is a list of DRI2BUFFER for the given DRI2 + attachment points. + + This request is only available with protocol version 1.1 or + later. + ⚙ ⚙ ⚙ ⚙ ⚙ ⚙ @@ -366,8 +399,11 @@ A.1 Common Types 0x6 DRI2BufferAccum 0x7 DRI2BufferFakeFrontLeft 0x8 DRI2BufferFakeFrontRight + 0x9 DRI2BufferDepthStencil └─── - Used to encode the possible attachment points. + Used to encode the possible attachment points. The attachment + DRI2BufferDepthStencil is only available with protocol version 1.1 or + later. ┌─── DRI2BUFFER @@ -381,6 +417,14 @@ A.1 Common Types manager name, the pitch and chars per pixel for a buffer attached to a given drawable. +┌─── + DRI2ATTACH_FORMAT + 4 CARD32 attachment + 4 CARD32 format +└─── + Used to describe the attachment and format requested from the server. + This data type is only available with protocol version 1.1 or + later. A.2 Protocol Requests @@ -474,6 +518,25 @@ A.2 Protocol Requests 24 unused └─── +┌─── + DRI2GetBuffersWithFormat + 1 CARD8 major opcode + 1 3 DRI2 opcode + 2 3 length + 4 DRAWABLE drawable + 4 n number of attachments + 8n LISTofDRI2ATTACH_FORMAT attachments and formats + ▶ + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 0 reply length + 4 CARD32 width of drawable + 4 CARD32 height of drawable + 4 CARD32 buffer count + 12 unused + 5n LISTofDRI2BUFFER buffers +└─── A.3 Protocol Events diff --git a/dri2tokens.h b/dri2tokens.h index 087159f..d56e4fb 100644 --- a/dri2tokens.h +++ b/dri2tokens.h @@ -42,6 +42,7 @@ #define DRI2BufferAccum 6 #define DRI2BufferFakeFrontLeft 7 #define DRI2BufferFakeFrontRight 8 +#define DRI2BufferDepthStencil 9 #define DRI2DriverDRI 0 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org