summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0a5e388)
raw | patch | inline | side by side (parent: 0a5e388)
author | Aaron Plattner <aplattner@nvidia.com> | |
Mon, 12 Oct 2009 20:11:47 +0000 (13:11 -0700) | ||
committer | Aaron Plattner <aplattner@nvidia.com> | |
Tue, 17 Nov 2009 21:16:17 +0000 (13:16 -0800) |
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
configure.ac | patch | blob | history | |
dri2proto.h | patch | blob | history | |
dri2proto.txt | patch | blob | history | |
dri2tokens.h | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index d8f6bc854d87edd6c18ec027e88c19792e2f2f8d..fc961977b4088608e95fad43d4258f978c306e5b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.2], [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 8d76079a9a10c43c8c0a16ac5f428b8acaa802f3..ba10eb446447fd711e64e7ca57bf7278b77c8c20 100644 (file)
--- a/dri2proto.h
+++ b/dri2proto.h
#define DRI2_NAME "DRI2"
#define DRI2_MAJOR 1
-#define DRI2_MINOR 1
+#define DRI2_MINOR 2
#define DRI2NumberErrors 0
#define DRI2NumberEvents 0
diff --git a/dri2proto.txt b/dri2proto.txt
index e931bfbff91b57681210dc57af9e9de4ddf3d928..d10e372a7873997b41381e32e1be9b6c791771ce 100644 (file)
--- a/dri2proto.txt
+++ b/dri2proto.txt
5. Protocol Types
-DRI2DRIVER { DRI2DriverDRI }
+DRI2DRIVER { DRI2DriverDRI
+ DRI2DriverVDPAU }
These values describe the type of driver the client will want
to load. The server sends back the name of the driver to use
┌───
DRI2DRIVER
0x0 DRI2DriverDRI
+ 0x1 DRI2DriverVDPAU
└───
┌───
diff --git a/dri2tokens.h b/dri2tokens.h
index d56e4fb535edda2f3698abb85282a764c98c7d6b..d5602712145f5b14f5a2177003914ee1cf0d0057 100644 (file)
--- a/dri2tokens.h
+++ b/dri2tokens.h
#define DRI2BufferDepthStencil 9
#define DRI2DriverDRI 0
+#define DRI2DriverVDPAU 1
#endif