diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-12-13 11:36:38 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-12-13 14:59:03 -0500 |
| commit | ec6087bf070131bc3a26848fb9fb840f09b0e19d (patch) | |
| tree | eddb8a3ab165d3735a03fa0731dcdd5440142b19 | |
| parent | e6fafd3de70d315130fb6e5732cfd02a5901b788 (diff) | |
dri3: Don't use the major/minor version from the protocol headers
We want to advertise the version we implement, not the version the
protocol headers happen to describe.
Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | dri3/dri3_request.c | 5 | ||||
| -rw-r--r-- | include/protocol-versions.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index 3ebb9d509..4e1408fb5 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -29,6 +29,7 @@ #include <unistd.h> #include <xace.h> #include "../Xext/syncsdk.h" +#include <protocol-versions.h> static int proc_dri3_query_version(ClientPtr client) @@ -38,8 +39,8 @@ proc_dri3_query_version(ClientPtr client) .type = X_Reply, .sequenceNumber = client->sequence, .length = 0, - .majorVersion = DRI3_MAJOR, - .minorVersion = DRI3_MINOR + .majorVersion = SERVER_DRI3_MAJOR_VERSION, + .minorVersion = SERVER_DRI3_MINOR_VERSION }; REQUEST_SIZE_MATCH(xDRI3QueryVersionReq); diff --git a/include/protocol-versions.h b/include/protocol-versions.h index 95df8ce1a..7fe61e0ff 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -46,6 +46,10 @@ #define SERVER_DAMAGE_MAJOR_VERSION 1 #define SERVER_DAMAGE_MINOR_VERSION 1 +/* DRI3 */ +#define SERVER_DRI3_MAJOR_VERSION 1 +#define SERVER_DRI3_MINOR_VERSION 0 + /* DMX */ #define SERVER_DMX_MAJOR_VERSION 2 #define SERVER_DMX_MINOR_VERSION 2 |