Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net>
On Fri, Dec 13, 2013 at 12:05 PM, Adam Jackson <a...@redhat.com> wrote: > We want to advertise the version we implement, not the version the > protocol headers happen to describe. > > Signed-off-by: Adam Jackson <a...@redhat.com> > --- > dri3/dri3_request.c | 5 +++-- > 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 3ebb9d5..4e1408f 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 95df8ce..7fe61e0 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 > -- > 1.8.4.2 > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > -- Jasper
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel