x11proto-dri2: Changes to 'debian-unstable'
configure.ac | 2 +-
debian/changelog | 4 ++--
dri2tokens.h | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit c1ae11891617852fa9f2a784310702eb19a32f92
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jul 12 14:56:27 2012 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 8359fd7..b5d6dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11proto-dri2 (2.7-1) UNRELEASED; urgency=low
+x11proto-dri2 (2.8-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 20 Jun 2012 13:52:22 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 12 Jul 2012 14:55:45 +0200
x11proto-dri2 (2.6-2) unstable; urgency=low
commit 4eeacce4c4a300b938b7e3fb78a8e443c491780b
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Jul 7 10:20:12 2012 +0100
dri2proto: bump package to 2.8
this just so we can rely on 2.8 to build the server/mesa against.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index aeb86a9..6d1ebdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit fb9e9339876d0a7c4821f9dbea1635a43a06da01
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jan 20 10:34:58 2012 +0000
dri2proto: add prime protocol support. (v2.1)
So we reserve bits 16->19 for offload device ids, this means we can
have 6 offload devices, which is plenty for now, and we can bump
this further later without fear.
v2: I suck at maths, that is all. Fixed up the maths to match reality.
v2.1: fix typo
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/dri2tokens.h b/dri2tokens.h
index 16c9008..bdca866 100644
--- a/dri2tokens.h
+++ b/dri2tokens.h
@@ -45,6 +45,11 @@
#define DRI2BufferDepthStencil 9
#define DRI2BufferHiz 10
+/* keep bits 16 and above for prime IDs */
+#define DRI2DriverPrimeMask 7 /* 0 - 7 - allows for 6 devices*/
+#define DRI2DriverPrimeShift 16
+#define DRI2DriverPrimeId(x) (((x) >> DRI2DriverPrimeShift) & (DRI2DriverPrimeMask))
+
#define DRI2DriverDRI 0
#define DRI2DriverVDPAU 1
Reply to: