Update to dri2proto 2.8

This commit is contained in:
matthieu 2012-09-30 10:12:16 +00:00
parent 7856492790
commit aee7ae5fde
6 changed files with 156 additions and 303 deletions

View File

@ -1,3 +1,69 @@
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>
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>
commit 652fe8d9dd2393127b11741ba63cb95a83ad454f
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Wed May 2 12:03:31 2012 -0700
dri2proto: Add DRI2GetParam request
Bump protocol version to 1.4.
Bump package version to 2.7.
This new protocol request effectively allows clients to perform feature
detection on the DDX.
If I had DRI2GetParam in June 2011, when I was implementing support in the
Intel DDX and Mesa for new hardware that required a new DRI2 attachment
format, then I could have avoided a week of pain caused by the necessity
to write a horrid feature detection hack [1] in Mesa. In the future, when
the work begins to add MSAA support to the Intel DDX, having a clean way
to do feature detection will allow us to avoid revisiting and expanding
that hack.
[1] mesa, commit aea2236a, function intel_verify_dri2_has_hi
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
commit 428688d1eaa3d0faa13a61613cdaeaabcb351f0e
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Wed May 2 11:56:37 2012 -0700
dri2proto: Fix documented opcodes
Fix the documented opcodes in dri2proto.txt to be consistent with the
actual opcode values in dri2proto.h and in xcb/proto:src/dri2.xml. (It
looks like the opcodes were incorrect due to copy-paste errors).
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
commit 7fd18b15646a62bd82a4eb0eca60a34c1731813d
Author: Chad Versace <chad@chad-versace.us>
Date: Wed May 11 12:50:11 2011 -0700

View File

@ -1,291 +0,0 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([DRI2Proto], [2.6], [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

View File

@ -35,11 +35,11 @@
#define DRI2_NAME "DRI2"
#define DRI2_MAJOR 1
#define DRI2_MINOR 3
#define DRI2_MINOR 4
#define DRI2NumberErrors 0
#define DRI2NumberEvents 2
#define DRI2NumberRequests 13
#define DRI2NumberRequests 14
#define X_DRI2QueryVersion 0
#define X_DRI2Connect 1
@ -54,6 +54,7 @@
#define X_DRI2WaitMSC 10
#define X_DRI2WaitSBC 11
#define X_DRI2SwapInterval 12
#define X_DRI2GetParam 13
/*
* Events
@ -330,4 +331,27 @@ typedef struct {
} xDRI2InvalidateBuffers;
#define sz_xDRI2InvalidateBuffers 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
CARD16 length B16;
CARD32 drawable B32;
CARD32 param B32;
} xDRI2GetParamReq;
#define sz_xDRI2GetParamReq 12
typedef struct {
BYTE type; /*X_Reply*/
BOOL is_param_recognized;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 value_hi B32;
CARD32 value_lo B32;
CARD32 pad1 B32;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
} xDRI2GetParamReply;
#define sz_xDRI2GetParamReply 32
#endif

View File

@ -440,6 +440,36 @@ The name of this extension is "DRI2".
DRI2SwapBuffers requests to swap at most once per interval frames,
which is useful useful for limiting the frame rate.
┌───
DRI2GetParam
drawable: DRAWABLE
param: CARD32
is_param_recognized: BOOL
value: CARD64
└───
Errors: Drawable
Get the value of a parameter. The parameter's value is looked up on
the screen associated with 'drawable'.
Parameter names in which the value of the most significant byte is
0 are reserved for the X server. Currently, no such parameter names
are defined. (When any such names are defined, they will be defined in
this extension specification and its associated headers).
Parameter names in which the byte's value is 1 are reserved for the
DDX. Such names are private to each driver and shall be defined in the
respective driver's headers.
Parameter names in which the byte's value is neither 0 nor 1 are
reserved for future use.
Possible values of 'is_param_recognized' are true (1) and false (0).
If false, then 'value' is undefined.
This request is only available with protocol version 1.4 or later.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
9. Extension Events
@ -512,6 +542,8 @@ The DRI2 extension has undergone a number of revisions before
2.6: Enlightenment attained. Added the DRI2BufferHiz attachment.
2.7: Added the DRI2GetParam request.
Compatibility up to 2.0 is not preserved, but was also never released.
@ -658,7 +690,7 @@ A.2 Protocol Requests
┌───
DRI2GetBuffers
1 CARD8 major opcode
1 3 DRI2 opcode
1 5 DRI2 opcode
2 3 length
4 DRAWABLE drawable
4 n number of attachments
@ -678,7 +710,7 @@ A.2 Protocol Requests
┌───
DRI2CopyRegion
1 CARD8 major opcode
1 4 DRI2 opcode
1 6 DRI2 opcode
2 3 length
4 DRAWABLE drawable
4 REGION region
@ -695,7 +727,7 @@ A.2 Protocol Requests
┌───
DRI2GetBuffersWithFormat
1 CARD8 major opcode
1 3 DRI2 opcode
1 7 DRI2 opcode
2 3 length
4 DRAWABLE drawable
4 n number of attachments
@ -715,7 +747,7 @@ A.2 Protocol Requests
┌───
DRI2SwapBuffers
1 CARD8 major opcode
1 7 DRI2 opcode
1 8 DRI2 opcode
2 8 length
4 DRAWABLE drawable
@ -736,7 +768,7 @@ A.2 Protocol Requests
┌───
DRI2SwapBuffers
1 CARD8 major opcode
1 7 DRI2 opcode
1 8 DRI2 opcode
2 8 length
4 DRAWABLE drawable
4 CARD32 target_msc_hi
@ -758,7 +790,7 @@ A.2 Protocol Requests
┌───
DRI2GetMSC
1 CARD8 major opcode
1 7 DRI2 opcode
1 9 DRI2 opcode
2 8 length
4 DRAWABLE drawable
@ -777,7 +809,7 @@ A.2 Protocol Requests
┌───
DRI2WaitMSC
1 CARD8 major opcode
1 7 DRI2 opcode
1 10 DRI2 opcode
2 8 length
4 DRAWABLE drawable
4 CARD32 target_msc_hi
@ -802,7 +834,7 @@ A.2 Protocol Requests
┌───
DRI2WaitSBC
1 CARD8 major opcode
1 7 DRI2 opcode
1 11 DRI2 opcode
2 8 length
4 DRAWABLE drawable
4 CARD32 swap_hi
@ -823,13 +855,30 @@ A.2 Protocol Requests
┌───
DRI2SwapInterval
1 CARD8 major opcode
1 7 DRI2 opcode
1 12 DRI2 opcode
2 8 length
4 DRAWABLE drawable
4 CARD32 interval
└───
┌───
DRI2GetParam
1 CARD8 major opcode
1 13 DRI2 opcode
2 8 length
4 DRAWABLE drawable
4 CARD32 param
1 1 Reply
1 BOOL is_param_recognized
2 CARD16 sequence number
4 0 reply length
4 CARD32 value_hi
4 CARD32 value_lo
16 unused
└───
A.3 Protocol Events
The DRI2 extension specifies DRI2_BufferSwapComplete and

View File

@ -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