From 8b75d0f9d347d7c3aad1e53809e0a2bed03b92fc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 17 Sep 2009 14:17:54 +1000 Subject: render: reply with the server or client version, whichever is lower. Protocol requires that the lower of [server version, client version] is returned to the client. The other part of the issue discussed in reply to [1] remains. [1] http://lists.freedesktop.org/archives/xorg-devel/2009-September/001990.html Reported-by: Julien Cristau Signed-off-by: Peter Hutterer --- render/render.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'render') diff --git a/render/render.c b/render/render.c index 995ebd956..aadecf22e 100644 --- a/render/render.c +++ b/render/render.c @@ -270,8 +270,18 @@ ProcRenderQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = RENDER_MAJOR; - rep.minorVersion = RENDER_MINOR; + + if ((stuff->majorVersion * 1000 + stuff->minorVersion) < + (RENDER_MAJOR * 1000 + RENDER_MINOR)) + { + rep.majorVersion = stuff->majorVersion; + rep.minorVersion = stuff->minorVersion; + } else + { + rep.majorVersion = RENDER_MAJOR; + rep.minorVersion = RENDER_MINOR; + } + if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); -- cgit v1.2.3