summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2009-10-12 13:11:47 -0700
committerAaron Plattner <aplattner@nvidia.com>2009-11-17 13:16:17 -0800
commit499241b74322b984bbbee0803513e32b6f83bb31 (patch)
treef0665519dbe0e9151d17579fceee1d43246a9e38
parent0a5e388ae9c1306bb253c161071424e0282ea8f5 (diff)
Add a DRI2DriverVDPAU driver type.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Acked-by: Kristian Høgsberg <krh@bitplanet.net>
-rw-r--r--configure.ac2
-rw-r--r--dri2proto.h2
-rw-r--r--dri2proto.txt4
-rw-r--r--dri2tokens.h1
4 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d8f6bc8..fc96197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
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 8d76079..ba10eb4 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
diff --git a/dri2proto.txt b/dri2proto.txt
index e931bfb..d10e372 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -128,7 +128,8 @@ No errrors defined by the DRI2 extension.
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
@@ -386,6 +387,7 @@ A.1 Common Types
┌───
DRI2DRIVER
0x0 DRI2DriverDRI
+ 0x1 DRI2DriverVDPAU
└───
┌───
diff --git a/dri2tokens.h b/dri2tokens.h
index d56e4fb..d560271 100644
--- a/dri2tokens.h
+++ b/dri2tokens.h
@@ -45,5 +45,6 @@
#define DRI2BufferDepthStencil 9
#define DRI2DriverDRI 0
+#define DRI2DriverVDPAU 1
#endif