- dri2proto 2.2

- glproto 1.4.11
This commit is contained in:
Dave Airlie 2010-01-16 08:34:44 +00:00
parent aaa6a7f7c3
commit 79263cb3a7
4 changed files with 11 additions and 111 deletions

View File

@ -29,3 +29,5 @@ inputproto-2.0.tar.bz2
kbproto-1.0.4.tar.bz2
xf86miscproto-0.9.3.tar.bz2
xproxymanagementprotocol-1.0.3.tar.bz2
dri2proto-2.2.tar.bz2
glproto-1.4.11.tar.bz2

View File

@ -1,100 +0,0 @@
diff --git a/dri2proto.h b/dri2proto.h
index 8d76079..37873c4 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -35,7 +35,7 @@
#define DRI2_NAME "DRI2"
#define DRI2_MAJOR 1
-#define DRI2_MINOR 1
+#define DRI2_MINOR 2
#define DRI2NumberErrors 0
#define DRI2NumberEvents 0
@@ -49,6 +49,7 @@
#define X_DRI2GetBuffers 5
#define X_DRI2CopyRegion 6
#define X_DRI2GetBuffersWithFormat 7
+#define X_DRI2SwapBuffers 8
typedef struct {
CARD32 attachment B32;
@@ -191,4 +192,12 @@ typedef struct {
} xDRI2CopyRegionReply;
#define sz_xDRI2CopyRegionReply 32
+typedef struct {
+ CARD8 reqType;
+ CARD8 dri2ReqType;
+ CARD16 length B16;
+ CARD32 drawable B32;
+} xDRI2SwapBuffersReq;
+#define sz_xDRI2SwapBuffersReq 8
+
#endif
diff --git a/dri2proto.txt b/dri2proto.txt
index e931bfb..1bad3b9 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -105,6 +105,11 @@ DRI2 implementation of direct rendering GLX, should use these enty
points to copy contents back and forth to as necessary to ensure
consistent rendering.
+The client may also use the DRI2SwapBuffers function to request a swap
+of the front and back buffers. If the display server supports it, this
+operation may be preferred, since it may be easier and/or more performant
+for the server to perform a simple buffer swap rather than a blit.
+
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -288,6 +293,21 @@ The name of this extension is "DRI2".
the server has seen the request before proceeding with
rendering the next frame.
+┌───
+ DRI2SwapBuffers
+ drawable: DRAWABLE
+ ▶
+ buffers: LISTofDRI2BUFFER
+└───
+ Errors: Window
+
+ Schedule a swap of the front and back buffers with the display
+ server.
+
+ This request has no reply. The server is expected to either perform
+ a buffer exchange or queue one before returning. The client should
+ invalidate its render buffers after sending this request, causing
+ a subsequent GetBuffers request to get updated buffer info.
┌───
DRI2GetBuffersWithFormat
@@ -542,6 +562,27 @@ A.3 Protocol Events
The DRI2 extension specifies no events.
+┌───
+ DRI2SwapBuffers
+ 1 CARD8 major opcode
+ 1 7 DRI2 opcode
+ 2 8 length
+ 4 DRAWABLE drawable
+ ▶
+ 1 1 Reply
+ 1 unused
+ 2 CARD16 sequence number
+ 4 0 reply length
+ 4 CARD32 buffer count
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 5n LISTofDRI2BUFFER buffers
+└───
+
A.4 Protocol Errors

View File

@ -16,8 +16,6 @@ a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2
4434894fc7d4eeb4a22e6b876d56fdaa xf86vidmodeproto-2.3.tar.bz2
a8aadcb281b9c11a91303e24cdea45f5 xineramaproto-1.2.tar.bz2
75c9edff1f3823e5ab6bb9e66821a901 xproto-7.0.16.tar.bz2
c9f8cebfba72bfab674bc0170551fb8d glproto-1.4.10.tar.bz2
5cb7987d29db068153bdc8f23c767c43 dri2proto-2.1.tar.bz2
0f7acbc14a082f9ae03744396527d23d inputproto-2.0.tar.bz2
a5c244c36382b0de39b2828cea4b651d randrproto-1.3.1.tar.bz2
fb6ccaae76db7a35e49b12aea60ca6ff xextproto-7.1.1.tar.bz2
@ -25,3 +23,5 @@ fb6ccaae76db7a35e49b12aea60ca6ff xextproto-7.1.1.tar.bz2
7f439166a9b2bf81471a33951883019f kbproto-1.0.4.tar.bz2
ca63bbb31cf5b7f37b2237e923ff257a xf86miscproto-0.9.3.tar.bz2
9de22ca1522008c28fb03dfc41ba2d30 xproxymanagementprotocol-1.0.3.tar.bz2
3ca8ddb42cd4ee31b8690031303221af dri2proto-2.2.tar.bz2
78e7c4dc7dcb74b1869fee7897e00f59 glproto-1.4.11.tar.bz2

View File

@ -7,7 +7,7 @@
Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel
Version: 7.4
Release: 34%{?dist}
Release: 35%{?dist}
License: MIT
Group: Development/System
URL: http://www.x.org
@ -18,11 +18,11 @@ Source0: http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
Source1: http://www.x.org/pub/individual/proto/compositeproto-0.4.1.tar.bz2
Source2: http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
Source3: http://www.x.org/pub/individual/proto/dmxproto-2.3.tar.bz2
Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
Source31: http://www.x.org/pub/individual/proto/dri2proto-2.2.tar.bz2
Source4: http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
Source5: http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
Source7: http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
Source8: http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
Source8: http://www.x.org/pub/individual/proto/glproto-1.4.11.tar.bz2
Source9: http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.4.tar.bz2
Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
@ -42,8 +42,6 @@ Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
Patch1: dri2-page-flip.patch
BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@ -61,10 +59,6 @@ X.Org X11 Protocol headers
%prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
cd dri2proto-2.1
%patch1 -p1 -b .page-flip
cd ..
%build
# Proceed through each proto package directory, building them all
@ -267,6 +261,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/xproxymngproto.pc
%changelog
* Sat Jan 16 2010 Dave Airlie <airlied@redhat.com> 7.4-35
- dri2proto 2.2
- glproto 1.4.11
* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 7.4-34
- kbproto 1.0.4
- xf86miscproto 0.9.3