diff options
| -rw-r--r-- | .gitignore | 78 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | README | 30 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | dri2proto.txt | 4 | ||||
| -rw-r--r-- | dri2tokens.h | 1 |
6 files changed, 116 insertions, 17 deletions
@@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -dri2proto.pc -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -dri2proto-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for dri2proto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/Makefile.am b/Makefile.am index d26a4a5..153b422 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,13 +6,14 @@ pkgconfig_DATA = dri2proto.pc EXTRA_DIST = dri2proto.pc.in dri2proto.txt -EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL @@ -0,0 +1,30 @@ + Direct Rendering Infrastructure 2 Extension + +This extension defines a protocol to securely allow user applications to access +the video hardware without requiring data to be passed through the X server. + +Extension name: DRI2 + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/dri2proto + + http://cgit.freedesktop.org/xorg/proto/dri2proto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/configure.ac b/configure.ac index 003f7ac..fc96197 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,13 @@ AC_PREREQ([2.57]) AC_INIT([DRI2Proto], [2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile dri2proto.pc]) diff --git a/dri2proto.txt b/dri2proto.txt index 35bad41..de58289 100644 --- a/dri2proto.txt +++ b/dri2proto.txt @@ -158,7 +158,8 @@ The only event provided by DRI2 is DRI2_BufferSwapComplete. 6. 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 @@ -535,6 +536,7 @@ A.1 Common Types ┌─── DRI2DRIVER 0x0 DRI2DriverDRI + 0x1 DRI2DriverVDPAU └─── ┌─── diff --git a/dri2tokens.h b/dri2tokens.h index a20462a..7804e4d 100644 --- a/dri2tokens.h +++ b/dri2tokens.h @@ -45,6 +45,7 @@ #define DRI2BufferDepthStencil 9 #define DRI2DriverDRI 0 +#define DRI2DriverVDPAU 1 /* Event sub-types for the swap complete event */ #define DRI2_EXCHANGE_COMPLETE 0x1 |