From 66d339c11281b88212d55b4017e1fc7ca549e314 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 20 Jun 2013 12:09:46 -0700 Subject: Eliminate driverType and driverName from Open request Make application figure out the right driver on its own. Signed-off-by: Keith Packard --- dri3proto.h | 5 ++--- dri3proto.txt | 19 ++++++++----------- dri3tokens.h | 3 --- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dri3proto.h b/dri3proto.h index 2b7821c..8abf0be 100644 --- a/dri3proto.h +++ b/dri3proto.h @@ -67,22 +67,21 @@ typedef struct { CARD8 dri3ReqType; CARD16 length B16; CARD32 drawable B32; - CARD32 driverType B32; CARD32 provider B32; } xDRI3OpenReq; -#define sz_xDRI3OpenReq 16 +#define sz_xDRI3OpenReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 nfd; CARD16 sequenceNumber B16; CARD32 length B32; - CARD32 driverNameLength B32; CARD32 pad2 B32; CARD32 pad3 B32; CARD32 pad4 B32; CARD32 pad5 B32; CARD32 pad6 B32; + CARD32 pad7 B32; } xDRI3OpenReply; #define sz_xDRI3OpenReply 32 diff --git a/dri3proto.txt b/dri3proto.txt index 3489a5c..b73e9bb 100644 --- a/dri3proto.txt +++ b/dri3proto.txt @@ -103,25 +103,22 @@ The name of this extension is "DRI3" ┌─── DRI3Open drawable: DRAWABLE - driverType: DRI3DRIVER provider: PROVIDER ▶ nfd: CARD8 - driver: STRING device: FD └─── Errors: Drawable, Value, Match This requests that the X server open the direct rendering - device associated with drawable, driverType and RandR - provider. The provider must support SourceOutput or SourceOffload. - - The direct rendering library used to implement the specified - 'driverType' is returned in 'driver'. The file - descriptor for the device is returned in 'device'. 'nfd' will - be set to one (this is strictly a convenience for XCB which - otherwise would need request-specific information about how - many file descriptors were associated with this reply). + device associated with drawable and RandR provider. The + provider must support SourceOutput or SourceOffload. + + The file descriptor for the device is returned in + 'device'. 'nfd' will be set to one (this is strictly a + convenience for XCB which otherwise would need + request-specific information about how many file descriptors + were associated with this reply). ┌─── DRI3PixmapFromBuffer diff --git a/dri3tokens.h b/dri3tokens.h index fab7143..5eebe4d 100644 --- a/dri3tokens.h +++ b/dri3tokens.h @@ -23,9 +23,6 @@ #ifndef _DRI3_TOKENS_H_ #define _DRI3_TOKENS_H_ -#define DRI3DriverDRI 0 -#define DRI3DriverVDPAU 1 - #define DRI3ConfigureNotify 0 #define DRI3PixmapScanout 0x00000001 -- cgit v1.2.1