xserver: Branch 'master'

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Peter Hutterer wrote:
> On Tue, Sep 29, 2009 at 04:49:57PM -0700, Ian Romanick wrote:
>>  glx/glxcmds.c    |   11 ++++++++---
>>  glx/glxdri2.c    |   14 ++++++++++++++
>>  glx/glxext.c     |    8 +++++++-
>>  glx/glxscreens.c |    7 ++++---
>>  glx/glxscreens.h |    2 ++
>>  glx/glxserver.h  |    3 +++
>>  6 files changed, 38 insertions(+), 7 deletions(-)
>>
>> New commits:
>> commit ad5c0d9efa47476ed5cf75c82265c73919e468b4
>> Author: Ian Romanick <ian.d.romanick at intel.com>
>> Date:   Tue Sep 29 16:43:43 2009 -0700
>>
>>     GLX: Enable GLX 1.4 on DRI2
>>     
>>     Return the minimum GLX version supported by all screens.  Assume that
>>     DRI2 screens have all the required features for GLX 1.4.  Assume that
>>     everyone else can only support GLX 1.2.
>>     
>>     Reviewed-by: Kristian Høgsberg <krh at redhat.com>
>>     Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>
>>
>> diff --git a/glx/glxcmds.c b/glx/glxcmds.c
>> index b1061a8..30c25a9 100644
>> --- a/glx/glxcmds.c
>> +++ b/glx/glxcmds.c
>> @@ -739,8 +739,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc)
>>      ** client if it wants to work with older clients; however, in this
>>      ** implementation the server just returns its version number.
>>      */
>> -    reply.majorVersion = SERVER_GLX_MAJOR_VERSION;
>> -    reply.minorVersion = SERVER_GLX_MINOR_VERSION;
>> +    reply.majorVersion = glxMajorVersion;
>> +    reply.minorVersion = glxMinorVersion;
>>      reply.length = 0;
>>      reply.type = X_Reply;
>>      reply.sequenceNumber = client->sequence;
> 
> SERVER_GLX_MAJOR_VERSION (and MINOR) is now unused but still hanging around
> in the header file. The whole point of that define was that we have a single
> location where the supported protocol versions are visible. If that's not
> possible for GLX and DIR2, remove the define.
> 
> Or add a SERVER_GLXDRI2_MAJOR_VERSION with a comment that this is the
> version supported for DRI2 clients.
> 
> With this patch, you've sprinkled 1.4 hardcoded into two files, and 1.2 into
> another file. Which makes it quite amusing for someone who's not familiar
> with the code to find out what version is actually supported.

Which is always amusing because the answer is that it depends.  It
depends on the level of protocol supported by the server and the level
of functionality provided by the driver.  The server supports 1.4
protocol.  All current DRI1 drivers support 1.2 functionality.  All
current DRI2 drivers support 1.4 functionality.

I'll post a patch in a bit.  Let me know if you like it better.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkrE5Y4ACgkQX1gOwKyEAw/B0QCglC9lb2KaYJe0gmSPSPflOj2G
v9oAoJpEaQI8xUSnWJlc+LoGJSDSnXUo
=F0pZ
-----END PGP SIGNATURE-----